Bug 844183: Uplift Add-on SDK changeset 2bee189e1cb87f5fbe38ce862c8ff35ee0978480

https://github.com/mozilla/addon-sdk/compare/bf2c2f609babcea412a2349a431ae6bdbedcf05d...2bee189e1cb87f5fbe38ce862c8ff35ee0978480