am bb6f9146: (-s ours) DO NOT MERGE: Fix for 2295810: Auto-correction of...
am bb6f9146: (-s ours) DO NOT MERGE: Fix for 2295810: Auto-correction of English results in Englishman
Merge commit 'bb6f9146' into eclair-mr2
* commit 'bb6f9146':
DO NOT MERGE: Fix for 2295810: Auto-correction of English results in Englishman