mozilla-b2g/gaia — pull request #15578 by KevinGrandon (2014-01-22 05:14:26+00:00)
Title: Benfrancis 959694 rocketbar

Simply resolving conflicts for now. Do not merge yet.