247024, patch by Anne van Kesteren <bug@annevankesteren.nl>, r+sr=bzbarsky git-svn-id: svn://10.0.0.236/trunk@170611 18797224-902f-48f8-a5cc-f745e15eee43
git-svn-id: svn://10.0.0.236/trunk@165963 18797224-902f-48f8-a5cc-f745e15eee43