Merge ee4c17ee from gingerbread

Change-Id: Ide109e517fb7610d60f31ba6aa99fe665b59d690
This commit is contained in:
Jean-Baptiste Queru 2011-02-03 13:03:36 -08:00
commit 3c988fc39c

Diff Content Not Available