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