mozilla-b2g/gaia — pull request #19340 by nullaus (2014-05-16 23:34:32+00:00)
Title: Bug1003321

* Cherry picked the change-set that seems to fix the issue in master.

r=kgrandon