Backed out changeset 52068b669c2a (bug 911209) for causing type errors in tests
Merge mozilla-central to mozilla-inbound on a CLOSED TREE

--HG--
extra : amend_source : df59c11ce430786cf326f237451a2c769f709cd5