mozilla-b2g/gaia — pull request #9184 by fabi1cazenave (2013-04-15 16:21:33+00:00)
Title: Uplift 1.0.1 bug828890

[bug 828890](https://bugzilla.mozilla.org/show_bug.cgi?id=828890) + [bug 858722](https://bugzilla.mozilla.org/show_bug.cgi?id=858722)