Update stable to r4696.

git-svn-id: http://webrtc.googlecode.com/svn/stable/talk@4697 4adac7df-926f-26a2-2b94-8c16560cd09d
16 files changed