Patch By Max Kanat-Alexander <mkanat@kerio.com> r=glob, a=justdave git-svn-id: svn://10.0.0.236/trunk@170127 18797224-902f-48f8-a5cc-f745e15eee43
Patch By Tomas Kopal <Tomas.Kopal@altap.cz> r=mkanat, a=myk git-svn-id: svn://10.0.0.236/trunk@169270 18797224-902f-48f8-a5cc-f745e15eee43