patch bv doron r=neil sr=bryner a=tor git-svn-id: svn://10.0.0.236/trunk@154589 18797224-902f-48f8-a5cc-f745e15eee43