when working on bug 327349. Also corrects a minor trunk-branch discrepancy that I discovered in the process of patching. bug=330489 r=annie.sullivan@gmail.com sr=ben@mozilla.org git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@192371 18797224-902f-48f8-a5cc-f745e15eee43