Bug 890755: sidebar.js throws TypeError ("sidebar is null") when browser dialogs are closed
Merge branch 'australis' of git://github.com/mozilla/addon-sdk into 890755

Conflicts:
	test/test-ui-sidebar.js
Merge pull request #1084 from erikvold/890755

Bug 890755: sidebar.js throws TypeError ("sidebar is null") when browser dialogs are closed r=@ZER0