am 1f95ef82: am 35bb6969: set up fast-forward from froyo-release to gingerbread

Merge commit '1f95ef82b95f3568b1bb69bf03d25c32700995af'

* commit '1f95ef82b95f3568b1bb69bf03d25c32700995af':
  Fix a regression with lookupKeys that contain special characters