merge from gingerbread

Change-Id: I12d6ef65986db41e658bf8d476a8e18c4dd89917
This commit is contained in:
Jean-Baptiste Queru 2010-12-09 09:11:06 -08:00
commit 062afde24e

Diff Content Not Available