Bug 671976:  Fix comment typo in previous commit.  DONTBUILD
Bug 846221 - Make the pref UI explain intl.charset.default better. r=gavin.
Bug 846273 - robocop_autophone.ini is not included in the test package, r=ted.