am f2b32f2a: resolved conflicts for merge of cfd7db6d to eclair
am f2b32f2a: resolved conflicts for merge of cfd7db6d to eclair

Merge commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4' into eclair-mr2

* commit 'f2b32f2a4b7279a92ef0870277bc99c659ee28f4':
  move recovery image to the top of the OTA package

RR-msm7x30/platform_manifest,see4ri/lolili,fallouttester/platform_manifest,ND-3500/platform_manifest,pranav01/platform_manifest,knone1/platform_manifest,xorware/android_build,hagar006/platform_manifest,xorware/android_build,xorware/android_build,Hybrid-Power/startsync,xorware/android_build,xorware/android_build