patch by kiko@async.com.br, r=caillon,bbaetz git-svn-id: svn://10.0.0.236/trunk@113203 18797224-902f-48f8-a5cc-f745e15eee43
Patch by Josh Soref <timeless@mac.com> r= dkl, justdave git-svn-id: svn://10.0.0.236/trunk@108715 18797224-902f-48f8-a5cc-f745e15eee43
git-svn-id: svn://10.0.0.236/trunk@108455 18797224-902f-48f8-a5cc-f745e15eee43