am cdffe35c: merge from gingerbread

* commit 'cdffe35cb330587b942f7771efad385261a03c83':