patch by jeroen.dobbelaere@acunia.com r=dveditz sr=brendan git-svn-id: svn://10.0.0.236/trunk@120697 18797224-902f-48f8-a5cc-f745e15eee43
patch by jeroen.dobbelaere@acunia.com r=dveditz sr=brendan git-svn-id: svn://10.0.0.236/trunk@120697 18797224-902f-48f8-a5cc-f745e15eee43