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