From e28664b2818302d30128ff23195fac3322cf8477 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Nov 19 2010 19:07:56 +0000
Subject: Fix merge error...


---

diff --git a/grub-fedora-14.patch b/grub-fedora-14.patch
index b7075c3..4e09630 100644
--- a/grub-fedora-14.patch
+++ b/grub-fedora-14.patch
@@ -44298,7 +44298,7 @@ index 4dbf6f5..cca4332 100644
    char *cur_entry = 0;
 +  struct term_entry *prev_term = NULL;
 +
-+  if (grub_verbose)
++  if (grub_verbose || grub_timeout != 0)
 +    cls();
  
    /*