Merge from trunk

diff --cc commands/xnu_uuid.c
index b01352269a46c72d6427e1953453b89323921895,b6f2b260493ad5d7cb5671468c135a8c7fa016bf..ecf8ba00a8670f74016bd19ca6aa4bee3454c729
--- 1/commands/xnu_uuid.c
--- 2/commands/xnu_uuid.c
+++ b/commands/xnu_uuid.c
@@@ -31,8 -31,8 +31,9 @@@
  #include <grub/misc.h>
  #include <grub/env.h>
  #include <grub/command.h>
+ #include <grub/i18n.h>
  #include <grub/crypto.h>
 +#include <grub/i18n.h>
  
  /* This prefix is used by xnu and boot-132 to hash
     together with volume serial. */

diff --cc normal/main.c
index cdb816bfc26c4be4abd688f78fbf434ee53bb193,b50e17025fbdbcc64d56871f91938b0476107820..0d70416122ff8aa4e1760f5ad51e6698bbb4e200
--- 1/normal/main.c
--- 2/normal/main.c
+++ b/normal/main.c
@@@ -433,6 -416,19 +433,20 @@@ grub_normal_init_page (struct grub_term
    grub_free (unicode_msg);
  }
  
+ static int reader_nested;
+ 
+ static char *
+ read_lists (struct grub_env_var *var __attribute__ ((unused)),
+           const char *val)
+ {
+   read_command_list ();
+   read_fs_list ();
+   read_handler_list ();
+   read_crypto_list ();
++  read_terminal_list ();
+   return val ? grub_strdup (val) : NULL;
+ }
+ 
  /* Read the config file CONFIG and execute the menu interface or
     the command line interface if BATCH is false.  */
  void
@@@ -440,13 -436,12 +454,10 @@@ grub_normal_execute (const char *config
  {
    grub_menu_t menu = 0;
  
-   read_command_list ();
-   read_fs_list ();
-   read_handler_list ();
-   read_crypto_list ();
-   read_terminal_list ();
+   read_lists (NULL, NULL);
+   grub_register_variable_hook ("prefix", NULL, read_lists);
    grub_command_execute ("parser.grub", 0, 0);
  
 -  reader_nested = nested;
 -
    if (config)
      {
        menu = read_config_file (config);