Merge remote branch 'korg/froyo' into manualmerge