r=shanjian, sr=bz, a=roc+moz git-svn-id: svn://10.0.0.236/trunk@129020 18797224-902f-48f8-a5cc-f745e15eee43
not part of build git-svn-id: svn://10.0.0.236/trunk@125734 18797224-902f-48f8-a5cc-f745e15eee43