pbos@webrtc.org b5a22b1464 Revert r6110 and r6109.
Effectively re-landing r6104 as well as r6108 which includes a fix to a
compile error that caused r6104 to be reverted in r6110.

BUG=
TBR=henrike@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6119 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-05-13 11:07:01 +00:00
..
2014-05-13 11:07:01 +00:00
2014-05-13 11:07:01 +00:00