347852, patch by Alfred Kayser <alfredkayser@nl.ibm.com>, r=darin, sr=bzbarsky git-svn-id: svn://10.0.0.236/trunk@216216 18797224-902f-48f8-a5cc-f745e15eee43
git-svn-id: svn://10.0.0.236/trunk@164527 18797224-902f-48f8-a5cc-f745e15eee43
git-svn-id: svn://10.0.0.236/trunk@164080 18797224-902f-48f8-a5cc-f745e15eee43