am fb73583e: am fe3315b5: Merge from gingerbread

* commit 'fb73583e26c08293f48b4b1c998e9f58d0914fb7':