See bug 82188 patch=brendan, r=me, sr=jband git-svn-id: svn://10.0.0.236/trunk@100264 18797224-902f-48f8-a5cc-f745e15eee43