am 6d0d6ef1: am fc618484: Merge from gingerbread

* commit '6d0d6ef1598502c20776d443ad93e18b036443be':