patch by bug@annevankesteren.nl r=doron sr=jst git-svn-id: svn://10.0.0.236/trunk@171388 18797224-902f-48f8-a5cc-f745e15eee43
git-svn-id: svn://10.0.0.236/trunk@74196 18797224-902f-48f8-a5cc-f745e15eee43