am fe3315b5: Merge from gingerbread

* commit 'fe3315b54cc86126b36950be5a242c1ef31658be':