sr=brendan, a=brendan. git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_7_BRANCH@155345 18797224-902f-48f8-a5cc-f745e15eee43