Merge recent changes to bochs-bios CVS head.

Slightly different order to rom-scanning.
diff --git a/src/boot.c b/src/boot.c
index af22e1e..2a27086 100644
--- a/src/boot.c
+++ b/src/boot.c
@@ -28,6 +28,8 @@
     if (type == 0 || type > 0x4)
         BX_PANIC("Bad drive type\n");
     printf("Booting from %s...\n", drivetypes[type]);
+
+    // XXX - latest cvs has BEV description
 }
 
 //--------------------------------------------------------------------------
@@ -40,7 +42,7 @@
     if (type == 0 || type > 0x3)
         BX_PANIC("Bad drive type\n");
 
-    printf("Boot from %s failed", drivetypes[type]);
+    printf("Boot failed");
     if (type < 4) {
         /* Report the reason too */
         if (reason==0)
@@ -48,7 +50,7 @@
         else
             printf(": could not read the boot disk");
     }
-    printf("\n");
+    printf("\n\n");
 }
 
 static void