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