patch by Henrik Skupin <hskupin@gmail.com>, r=bsmedberg, a=asa git-svn-id: svn://10.0.0.236/trunk@174557 18797224-902f-48f8-a5cc-f745e15eee43
git-svn-id: svn://10.0.0.236/trunk@171190 18797224-902f-48f8-a5cc-f745e15eee43
git-svn-id: svn://10.0.0.236/trunk@169840 18797224-902f-48f8-a5cc-f745e15eee43