manual merge from froyo

Change-Id: Ied6d44cd7a54a62e4613b026b8ca9451630f63e1