merge 83fdc69e from gingerbread - do not merge

Change-Id: Ib1e9e12244a44f75a93d66142e71915de6386680
This commit is contained in:
Jean-Baptiste Queru 2011-01-14 18:33:51 -08:00
commit dbe61dfa77

Diff Content Not Available