merge from open-source froyo

Change-Id: I947332f4e978326309fe14d01875ebfe94405c9f