Backed out changeset dcec4c42cd18 (bug 757866) for bug 980835
Merge mozilla-central and inbound; CLOSED TREE

--HG--
extra : amend_source : af326b0eb24cafb5212fab43dcecacc5ddf0ee60