Bug 964118 - page-mods need a way to alert content-scripts when the add-on in unloaded
Merge branch 'master' of git://github.com/mozilla/addon-sdk into 964118

Conflicts:
	lib/sdk/content/sandbox.js
Merge pull request #1390 from erikvold/964118

Bug 964118 - page-mods need a way to alert content-scripts when the add-on in unloaded r=@gozala