mozilla-b2g/gaia — pull request #2462 by etiennesegonzac (2012-07-16 16:53:24+00:00)
Title: Merging #2439

This incorporate #2439 with some minor nit picking.