mozilla-b2g/gaia — pull request #9152 by fabi1cazenave (2013-04-12 16:59:33+00:00)
Title: Bug 828890 — uplift to v1-train

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