Merge 66888a7c from gingerbread

Change-Id: Ieba42e9ecfaf6078d2c8442560119863a329fa06
This commit is contained in:
Jean-Baptiste Queru
2011-01-29 09:24:41 -08:00