Merge from open-source gingerbread

Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
This commit is contained in:
Jean-Baptiste Queru 2011-02-03 12:41:49 -08:00
commit 60bcbd0eae

Diff Content Not Available