Merge commit '82c68bfb' into eclair-mr2-plus-aosp * commit '82c68bfb': Fix for 2305181: "shift A shift M" quickly gives Am instead of AM