Merge from open-source gingerbread

Change-Id: Iec6167bec8423e39dde053f23969c1c76e10a461
This commit is contained in:
Jean-Baptiste Queru 2011-02-02 09:45:19 -08:00
commit 907b884345

Diff Content Not Available