patch by mvl@exedo.nl r=dougt sr=alecf git-svn-id: svn://10.0.0.236/trunk@139623 18797224-902f-48f8-a5cc-f745e15eee43
git-svn-id: svn://10.0.0.236/trunk@136286 18797224-902f-48f8-a5cc-f745e15eee43