merge crypto into multiout

diff --cc conf/any-emu.rmk
index 2c383f3870152a79cad5c7079cb1878a3f02caf4,a3b3c84d965aea6d2b149f40af5964d102a63bdf..bbc564c8032065c63405bd3728d2415da3d05672
--- 1/conf/any-emu.rmk
--- 2/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@@ -24,10 -24,10 +24,10 @@@ grub_emu_SOURCES = commands/minicmd.c c
        kern/partition.c kern/reader.c kern/term.c                      \
        kern/rescue_reader.c kern/rescue_parser.c                       \
        lib/arg.c normal/cmdline.c normal/datetime.c normal/misc.c      \
-       normal/handler.c normal/auth.c normal/autofs.c                  \
+       normal/handler.c normal/auth.c lib/crypto.c normal/autofs.c     \
        normal/completion.c normal/main.c normal/color.c                \
        normal/menu.c normal/menu_entry.c normal/menu_viewer.c          \
-       normal/menu_text.c normal/term.c                                \
 -      normal/menu_text.c normal/crypto.c                              \
++      normal/menu_text.c normal/crypto.c normal/term.c                \
        script/main.c script/execute.c script/function.c                \
        script/lexer.c script/script.c grub_script.tab.c                \
        partmap/amiga.c partmap/apple.c partmap/msdos.c partmap/sun.c   \

diff --cc conf/common.rmk
index 02d57f0a34f5142996e92518eee873aded28f297,271384d538c39ec3dc22614863de20258b8f1f59..83168557de1c9e42ba8fbf01a64bb6254de9cf7a
--- 1/conf/common.rmk
--- 2/conf/common.rmk
+++ b/conf/common.rmk
@@@ -543,7 -543,7 +543,7 @@@ normal_mod_SOURCES = normal/main.c norm
        normal/auth.c normal/autofs.c normal/handler.c \
        normal/color.c normal/completion.c normal/datetime.c normal/menu.c \
        normal/menu_entry.c normal/menu_text.c normal/menu_viewer.c \
-       normal/misc.c normal/term.c
 -      normal/misc.c normal/crypto.c
++      normal/misc.c normal/crypto.c normal/term.c
  normal_mod_CFLAGS = $(COMMON_CFLAGS)
  normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
  

diff --cc include/grub/normal.h
index d629338e60f9a6c13d7356050a366c7e9d904521,66b427bcbbcfc2600f4833e6186b1ba800853a7a..33c30b22a5f07ed165cd63fdd41b8ab1402dfccb
--- 1/include/grub/normal.h
--- 2/include/grub/normal.h
+++ b/include/grub/normal.h
@@@ -95,7 -95,8 +95,9 @@@ void read_command_list (void)
  /* Defined in `autofs.c'.  */
  void read_fs_list (void);
  
+ void read_crypto_list (void);
+ 
 +void grub_set_more (int onoff);
  
  #ifdef GRUB_UTIL
  void grub_normal_init (void);

diff --cc normal/main.c
Simple merge