am 3643c656: Merge from gingerbread

* commit '3643c656d6e3f0fb7c340779d25232a0b76d0af3':