Bug 962581 - Notice disconnections faster after waking up from sleep. r=clokep
Bug 962848 - Port |Bug 957220 - Enable code to build from m-c's config/rules.mk copies|. r=florian

--HG--
rename : mail/app/png.py => im/app/png.py
rename : mail/app/png2ico.py => im/app/png2ico.py