From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 7 Jan 2010 20:34:43 +0000 (+0100)
Subject: merge mainline into multiterm
X-Git-Tag: 1.98~202^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=44fcb2bc5908e6266ef01a2dc12a1006fc57fb71;p=thirdparty%2Fgrub.git

merge mainline into multiterm
---

44fcb2bc5908e6266ef01a2dc12a1006fc57fb71
diff --cc normal/main.c
index 0d7041612,84162c08a..739ad3763
--- a/normal/main.c
+++ b/normal/main.c
@@@ -441,9 -424,7 +441,8 @@@ read_lists (struct grub_env_var *var __
  {
    read_command_list ();
    read_fs_list ();
-   read_handler_list ();
    read_crypto_list ();
 +  read_terminal_list ();
    return val ? grub_strdup (val) : NULL;
  }