am c33e0739: Merge from gingerbread

* commit 'c33e07396b4de4453c9212aaeb13c0c36b875589':