Merge remote-tracking branch 'origin/similan' 67/12267/1
Antoine ELIAS [Tue, 13 Aug 2013 09:01:19 +0000 (11:01 +0200)]
Change-Id: I2b35528ff241b79968cded0ad7ec967fa2e557b5


Trivial merge