mozilla-b2g/gaia — pull request #2054 by timdream (2012-06-28 12:06:15+00:00)
Title: Real fix for #2036

Without breaking the hack from @vingtetun