mozilla-b2g/gaia — pull request #14456 by mcjimenez (2013-12-06 12:11:40+00:00)
Title: Merge pull request #14241 from mcjimenez/bug944495

Bug 944495 - Race condition when installing single variant apps(cherry picked from commit 573304f58bb431c3622a86786b5e17aaa65b07b9)

Conflicts:

apps/homescreen/js/configurator.js
apps/homescreen/js/grid.js