am bb6f9146: (-s ours) DO NOT MERGE: Fix for 2295810: Auto-correction of English results in Englishman

Merge commit 'bb6f9146f1de4e0bdfaafca1d1896e02d038751d' into eclair-mr2

* commit 'bb6f9146f1de4e0bdfaafca1d1896e02d038751d':
  DO NOT MERGE: Fix for 2295810: Auto-correction of English results in Englishman
tree: 89bc17018c5557fdd2e50bf84406b10cd88d3202
  1. dictionaries/
  2. dictionary/
  3. res/
  4. src/
  5. Android.mk
  6. AndroidManifest.xml