am 42196fd1: am cdffe35c: merge from gingerbread

* commit '42196fd10398c7250af364c0563893d209c8cc15':