Bug 866333: Added extra check to avoid wrong events property returned in cases, when, for example event type coincides with Object property, such as nonstandard Object.prototype.watch, for instance
(cherry picked from commit 09f7197a85475fd9fdbaf64ffeec553e86fe2da8)
Bug 866333: adding test for event names like "watch"
Bug 866532: expose prePath property on URL instances and making URL properties writable

Conflicts:
	lib/sdk/url.js
	test/test-url.js
Bug 878131: isPrivate() now always returns true if the new global pb service is enabled
Merge pull request #1042 from erikvold/878131

Bug 878131: isPrivate() now always returns true if the new global pb service is enabled r=@Gozala
Bug 792102 - Document support for cross-domain content scripts; r=@ochameau
Bug 882867: fixing tab:testOpenInNewWindowOnOpen test and making various other tab tests more stable
Bug 866532: Fixing broken tests from the previous merge
Merge branch 'master' of git://github.com/mozilla/addon-sdk into 866532v2
Merge pull request #1018 from erikvold/866532v2

Bug 866532: expose prePath property on URL instances and making URL properties writable a=@gozala r=@erikvold
Revert "Merge pull request #1018 from erikvold/866532v2"

This reverts commit 6faf1d06dc0ede94c9bfcc38858b1889d5ec7233, reversing
changes made to 0b52abe6a7f57f387459a2ac7cc62f5dcb70c947.
Bug 866532: expose prePath property on URL instances and making URL properties writable a=@gozala r=@erikvold
Merge pull request #1051 from erikvold/882867v2

Bug 882867: fixing tab:testOpenInNewWindowOnOpen and other tab tests r=@Mossop
abstract out the addon-page url check to ensure that we also close those addon-pages on unload. fix up the addon-page tests so they match.
bind the xul window to the hideChromeForLocation function

In order to avoid a "can't access dead object" TypeError we need to
bind the hideChromeForLocation back to the XULBrowserWindow object.
I've been struggling to write a test for this but can't come up with
anything to easily trigger and catch the error.
Bug 887560 - Convert test-windows-common.js to use new test framework
Merge pull request #1057 from erikvold/887560

Bug 887560 - Convert test-windows-common.js to use new test framework r=@jsantell
Implement nodejs's net module.
Merge pull request #1049 from Gozala/bug/websocket@820953

Bug 820953 - Expose web-socket API. r=@Mossop
Bug 887013 - test-url.js should not create a file in the profile dir (and using new test framework)