Previously I uploaded patch 640007 to address issue 471. Today, while discussing that patch with Andrew, we noticed this patch should do the job. Leo is not here to verify it, but Andrew did some test to verify it. I'll ask Leo to do some testing.
We don't want to abandon patch 640007 as it will save some complexity.
Review URL: https://webrtc-codereview.appspot.com/648004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@2405 4adac7df-926f-26a2-2b94-8c16560cd09d