Patch by darin, r+sr=bzbarsky+biesi, a=bzbarsky git-svn-id: svn://10.0.0.236/trunk@232998 18797224-902f-48f8-a5cc-f745e15eee43
Patch by darin, r+sr=bzbarsky+biesi, a=bzbarsky git-svn-id: svn://10.0.0.236/trunk@232998 18797224-902f-48f8-a5cc-f745e15eee43