mozilla-b2g/gaia — pull request #3645 by etiennesegonzac (2012-08-21 14:07:55+00:00)
Title: 2879 fix

Fixing #2879 + a bonus fix, because that's how we roll.