Index: trunk/i386/boot2/boot.c
===================================================================
--- trunk/i386/boot2/boot.c	(revision 1227)
+++ trunk/i386/boot2/boot.c	(revision 1228)
@@ -428,19 +428,19 @@
 		} else {
 			archCpuType = CPU_TYPE_I386;
 		}
+		
 		if (getValueForKey(karch, &val, &len, &bootInfo->chameleonConfig)) {
 			if (strncmp(val, "i386", 4) == 0) {
 				archCpuType = CPU_TYPE_I386;
 			}
 		}
         
-        if (getValueForKey(kKernelArchKey, &val, &len, &bootInfo->chameleonConfig)) {
+        	if (getValueForKey(kKernelArchKey, &val, &len, &bootInfo->chameleonConfig)) {
 			if (strncmp(val, "i386", 4) == 0) {
 				archCpuType = CPU_TYPE_I386;
 			}
 		}
 
-        //archCpuType = CPU_TYPE_I386;
         
 		// Notify moduals that we are attempting to boot
 		execute_hook("PreBoot", NULL, NULL, NULL, NULL);
@@ -481,7 +481,9 @@
 				break;
 			
 			if (!forceresume && ((sleeptime+3)<bvr->modTime)) {
+#if DEBUG    
 				printf ("Hibernate image is too old by %d seconds. Use ForceWake=y to override\n",bvr->modTime-sleeptime);
+#endif                
 				break;
 			}