Backed out changeset 5f0bfb16fa4a (bug 925605)
Automatic merge

--HG--
extra : amend_source : 144da043dc003a81bb60c0fd2deb4d176baa102d