Plain Diff
Merge commit '8dd38d6b' into eclair-plus-aosp * commit '8dd38d6b': android-2.1_r1 snapshot