am 8611db98: am f6b2beaa: am 05059b5b: am 8226140c: Merge from gingerbread

* commit '8611db980c20eff29706ea6805fc5aad56d4e6b4':