Rebase webrtc/base with r6863 version of talk/base:
cls integrated: r6809
svn diff -r 6808:6809 http://webrtc.googlecode.com/svn/trunk/talk/base > 6809.diff
patch -p0 -i 6809.diff

BUG=3379
TBR=solenberg@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/18089004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6864 4adac7df-926f-26a2-2b94-8c16560cd09d