patch by dougt r=bz,sr=darin,b=199335 git-svn-id: svn://10.0.0.236/trunk@145405 18797224-902f-48f8-a5cc-f745e15eee43