am 6dbdcd55: am db71bda6: Merge from gingerbread

* commit '6dbdcd55905e50e533d0d3d9abf735275bca68b6':