Merge branch 'master' of git://github.com/mozilla/addon-sdk into 1020667

Conflicts:
	lib/sdk/addon/runner.js
	lib/toolkit/loader.js