merge from open-source froyo

Change-Id: I2759c464efef13754154310d10816a5781243311