Back out 8832f208bfe9 from bug 1049930, other parts are not ready yet
Merging from default

changeset:   10837:0a07e75511f0
tag:         tip
parent:      10835:57fe0830092c
user:        Nick Thomas <nthomas@mozilla.com>
date:        Fri Aug 15 09:32:55 2014 +1200
summary:     Back out 8832f208bfe9 from bug 1049930, other parts are not ready yet

--HG--
branch : production