Patch by Marc Schumann <wurblzap@gmail.com>, r=mkanat, kevin.benton, a=myk git-svn-id: svn://10.0.0.236/trunk@196145 18797224-902f-48f8-a5cc-f745e15eee43
Patch by Gabriel Sales de Oliveira <gabriel@async.com.br> r=joel, a=justdave git-svn-id: svn://10.0.0.236/trunk@182410 18797224-902f-48f8-a5cc-f745e15eee43
git-svn-id: svn://10.0.0.236/trunk@182077 18797224-902f-48f8-a5cc-f745e15eee43