am ba509c8d: am c434bbbb: am 817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo release

Merge commit 'ba509c8db0b00fdc9143459b0d9fefb2c25a5861'

* commit 'ba509c8db0b00fdc9143459b0d9fefb2c25a5861':
  bump version from 2.2 to 2.2.1 for next froyo release