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
Bug 975641 Add debounce helper
Bug 854990: Detraitify Page-Mod
Merge pull request #1350 from jsantell/854990-detraitify-pagemod

Fix Bug 854990: Detraitify Page-Mod, r=@zer0
Merge pull request #1408 from jsantell/debounce

Fix Bug 975641 Add debounce helper r=@erikvold
Bug 900288 - Implement Child Process
Merge pull request #1330 from jsantell/implement-child_process

Fix Bug 900288 Implement child_process, r=@gozala
Fix child_process failings on linux
Change child-process tests to built-in stdin-stdout rather than custom scripts
Fix child-process tests for OSX 10.6
Bug 965860 - patch 2 - ConsoleAPI written in C++, r=bz