Merge "Merge remote branch 'korg/froyo' into merge" into gingerbread