Bug 1095583 - assert.throws should catch thrown strings
Merge branch 'master' of https://github.com/mozilla/addon-sdk into 1095583

Conflicts:
	lib/sdk/test/assert.js
Merge pull request #1705 from erikvold/1095583

Bug 1095583 - assert.throws should catch thrown strings r=@jsantell