am 487fa827: set up fast-forward from froyo-release to gingerbread

Merge commit '487fa827e699a6b8d3d64fc90c3e18976808c5c0'

* commit '487fa827e699a6b8d3d64fc90c3e18976808c5c0':
  Avoiding a race condition caused by configuration change during FroYo upgrade
  Resolving a race condition in upgrade to Froyo