use Services in place of XPCOMUtils to access permission manager; remove lazy service getter definitions for unused modules
use Services in place of XPCOMUtils to access permission manager
Trim URL on submit when adding manifests or URLs, fixes 178
(cherry picked from commit af253a5436cb0d63565a7de9b85a5333cf77c430)
Merge remote-tracking branch 'upstream/master'
Fix rotate button backgroung when active/inactive.
Merge branch 'master' into cleanup
import XPCOMUtils as new code uses it
remove test timeout workaround now that tests take five minutes to time out
fix tests, simplify them, and make them conventional
use assert.equal where appropriate
Merge pull request #482 from ochameau/rotate-btn-color

Fix rotate button background when active/inactive.
Merge pull request #483 from mykmelez/fix-tests

make tests work again and simplify/conventionalize them
Merge pull request #484 from mykmelez/remove-unused-getters

remove unnecessary getters and imports
update Gaia to 2013-05-01 tip + e.me location fix in bug 867514
update B2G to 2013-05-01 builds
Merge pull request #486 from mykmelez/update-b2g-gaia

update B2G/Gaia to 2013-05-01
update version for 4.0pre1 build
update version for 4.0pre2dev development
fix merge conflicts