Patch by Max Kanat-Alexander <mkanat@kerio.com> r=gerv,justdave a=justdave git-svn-id: svn://10.0.0.236/trunk@169050 18797224-902f-48f8-a5cc-f745e15eee43