am fbbe5ab5: am 42196fd1: am cdffe35c: merge from gingerbread

* commit 'fbbe5ab5255f68cc9f0f10f36f680719b82955b6':