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