Bug 858935 - Intermittent test-tabs.testOnPageShowEvent | Page was not cached after 5s
Bug 859009: URL is valid type for panel.contentURL
(cherry picked from commit cd5bd30c99ac4050e735344d2b3cfb3fae82af1a)

Conflicts:
	lib/sdk/content/loader.js
Merge pull request #935 from erikvold/859009-2

Bug 859009: panel.contentURL accepts a URL instance r=@gozala
Merge pull request #934 from ochameau/bug858935

fix Bug 858935 - Intermittent test-tabs.testOnPageShowEvent | Page was not cached after 5s, a=@ochameau
Merge branch 'master' of git://github.com/mozilla/addon-sdk