Merge "merge from open-source froyo" into froyo