patch by sand@blarg.net r=bryner sr=roc git-svn-id: svn://10.0.0.236/trunk@155122 18797224-902f-48f8-a5cc-f745e15eee43