Merge branch 'master' of github.com:mozilla/addon-sdk
Merge branch 'master' of https://github.com/zombie/addon-sdk