am 6f88d2b9: ignored 22d019b5

Merge commit '6f88d2b974eb0fef48cc4cb7f236dd2b9f449780'

* commit '6f88d2b974eb0fef48cc4cb7f236dd2b9f449780':
  Change branch name to gingerbread, to match reality - DO NOT MERGE