git-svn-id: svn://10.0.0.236/trunk@229359 18797224-902f-48f8-a5cc-f745e15eee43
Patch by Henrik Skupin <hskupin@gmail.com> r=bent sr=mscott git-svn-id: svn://10.0.0.236/trunk@227286 18797224-902f-48f8-a5cc-f745e15eee43