bug 196717, r=shanjian, sr=darin. git-svn-id: svn://10.0.0.236/trunk@140293 18797224-902f-48f8-a5cc-f745e15eee43