am 5a44d55c: Merge from gingerbread - do not merge

* commit '5a44d55cb6343cc33fea7a70c68537a38e839aac':