Merge from gingerbread

Change-Id: Icfc2bb041b1360a8a0258d7de5547fded86bf7ec
This commit is contained in:
Jean-Baptiste Queru 2010-12-10 08:01:07 -08:00
commit f724dbf7cb

Diff content is not available