Merge from gingerbread

Change-Id: Ifb3d42aa0f3772ca545f739df347eeb0ca7f58dd
This commit is contained in:
Jean-Baptiste Queru 2011-02-02 09:47:36 -08:00
commit 12801c78e9

Diff Content Not Available