=== modified file 'util/grub-reboot.in'
--- old/util/grub-reboot.in	2009-12-08 01:00:26 +0000
+++ new/util/grub-reboot.in	2009-12-20 06:57:34 +0000
@@ -96,7 +96,10 @@
 if [ "$prev_saved_entry" ]; then
     $grub_editenv ${grubdir}/grubenv set prev_saved_entry="$prev_saved_entry"
 else
-    $grub_editenv ${grubdir}/grubenv unset prev_saved_entry
+    #Set prev_saved_entry to zero. Setting the default to "0" is the same as
+    #setting it to "" but because of the way grub-reboot is currently
+    #implemented prev_saved_entry can't be zero length.
+    $grub_editenv ${grubdir}/grubenv set prev_saved_entry=0
 fi
 $grub_editenv ${grubdir}/grubenv set saved_entry="$entry"