Bug 301496. Patch by Alexei.Volkov, r=nelson git-svn-id: svn://10.0.0.236/trunk@218942 18797224-902f-48f8-a5cc-f745e15eee43