Merge branch 'gingerbread' of https://github.com/jwise/android_bootable_recovery into gingerbread