combined r= by darin / rrelyea, a=shaver git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@194347 18797224-902f-48f8-a5cc-f745e15eee43
combined r= by darin / rrelyea, a=shaver git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@194347 18797224-902f-48f8-a5cc-f745e15eee43