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