Android 2.1 release 2
Merge donut into master