am 82da01d6: Merge from gingerbread

* commit '82da01d6a32c4fbfe57155c119d4669d7faba438':