Merge branch 'froyo' of git@github.com:CyanogenMod/android_vendor_cyanogen into froyo