Merge branch 'froyo' into froyo-release