Patch originally by Emil Hesslow <hesslow@gmail.com> a=mscott for tb2 git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@202252 18797224-902f-48f8-a5cc-f745e15eee43