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