mozilla-b2g/gaia — pull request #1914 by etiennesegonzac (2012-06-25 15:00:20+00:00)
Title: Merging 1911

Just merging #1911 with lint fixes.