merge from froyo

Change-Id: Ic80ad93cd3b05d55ba8b4e16edaa59ee58f08f05