merge from froyo
merge from froyo

Change-Id: Ic80ad93cd3b05d55ba8b4e16edaa59ee58f08f05

DerTeufel/dualboot_recovery,DerTeufel/dualboot_recovery,Plain-Andy/android_platform_bootable_recovery,76Demented/bootable_recovery-,InsomniaAOSP/platform_bootable_recovery,76Demented/bootable_recovery-,76Demented/bootable_recovery-,kylinmoddev/android_bootable_recovery,kylinmoddev/android_bootable_recovery,76Demented/bootable_recovery-,Plain-Andy/android_platform_bootable_recovery,Plain-Andy/android_platform_bootable_recovery,Plain-Andy/android_platform_bootable_recovery,InsomniaAOSP/platform_bootable_recovery,DerTeufel/dualboot_recovery,randomblame/bootable_recovery,InsomniaAOSP/platform_bootable_recovery,DerTeufel/dualboot_recovery,kylinmoddev/android_bootable_recovery,kylinmoddev/android_bootable_recovery,randomblame/bootable_recovery,InsomniaAOSP/platform_bootable_recovery,randomblame/bootable_recovery,DerTeufel/dualboot_recovery,randomblame/bootable_recovery,InsomniaAOSP/platform_bootable_recovery,randomblame/bootable_recovery,76Demented/bootable_recovery-