patch by bz, r=enndeakin, sr=roc, a=ss git-svn-id: svn://10.0.0.236/trunk@257355 18797224-902f-48f8-a5cc-f745e15eee43