am db71bda6: Merge from gingerbread

* commit 'db71bda6f696aff6047e6c26c32e0c08bf6851bc':