Bug 934646 - Clobber. r=me
Bug 939296 - Build content/html in unified mode; r=jst,bzbarsky

--HG--
extra : rebase_source : e8cf6dfa1b5fc1b3a3db8742e4010fc2479740ed