=== modified file 'util/grub.d/00_header.in'
--- old/util/grub.d/00_header.in	2009-12-16 20:25:37 +0000
+++ new/util/grub.d/00_header.in	2009-12-16 20:41:14 +0000
@@ -43,10 +43,13 @@
 set default=${GRUB_DEFAULT}
 if [ \${prev_saved_entry} ]; then
   saved_entry=\${prev_saved_entry}
-  save_env saved_entry
-  prev_saved_entry=
-  save_env prev_saved_entry
-  boot_once=true
+  if save_env saved_entry; then
+    prev_saved_entry=
+    save_env prev_saved_entry
+    boot_once=true
+  else
+    default=\${prev_saved_entry}
+  fi
 fi
 
 function savedefault {