Merge from open-source froyo

Change-Id: Ifa75fce9bd362b06ecb622219ef501e61e89fd76