Android 2.1 release 2
Merge branch 'eclair' into eclair-release