merge from open-source froyo

Change-Id: I6bac03b1f646ea171ee20f0e90d37f337d7987fa