Bug 961498: Prevent ICO decoder from exploding when faced with single-resource ICOs r=rnewman
Merge m-c to fx-team.
Bug 961532 - get rid of win7-specific-but-really-identical inverted Toolbar.png for Australis, r?ttaubert
merge fx-team to mozilla-central with australis change included

--HG--
extra : amend_source : 775ddd556112681669257547e825f4c9c6f3c62d