Bug 964614 - Intermittent TEST-UNEXPECTED-FAIL | tests/test-addon-page.test add-on page deprecation message | only one error is dispatched - 1 == 0 | TypeError: messages[0] is undefined
Merge branch 'master' of https://github.com/mozilla/addon-sdk into 964614

Conflicts:
	test/addons/addon-page/main.js
Merge pull request #1375 from erikvold/964614

Bug 964614 - Intermittent TEST-UNEXPECTED-FAIL | tests/test-addon-page.test add-on page deprecation message r=@ZER0