patch by biesi r=bryner sr=smfr a=chase git-svn-id: svn://10.0.0.236/trunk@177445 18797224-902f-48f8-a5cc-f745e15eee43