Update stable to r4954.

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