Merge "Merge remote branch 'korg/eclair' into eclairmerge" into froyo