mozilla-b2g/gaia — pull request #26640 by nullaus (2014-12-05 16:34:45+00:00)
Title: Merge pull request #26598 from nullaus/bug1100714

Bug1100714
(cherry picked from commit 81580722b6f7e576a11e7973c0899cd55bd2f24c)

Conflicts:
apps/system/test/unit/app_chrome_test.js