Merge from master

Change-Id: Ib9bc82ee0517945c5a713692d748042601d406ef
This commit is contained in:
Jean-Baptiste Queru 2012-02-14 09:57:28 -08:00
commit a9360fa5f6

Diff Content Not Available