merge from open-source froyo

Change-Id: Ia703f40fe40ea86791db8090dc821f2ab0ffdd4d