merge with mainline

diff --cc conf/common.rmk
index c437156b7ef194ff22cc9be9d5f0040ae941417d,f92e5bc4c7051a3393be4ddf1e78a8540f77763d..4ab829470dbf4858403ad0d43ddd295c773d04f1
--- 1/conf/common.rmk
--- 2/conf/common.rmk
+++ b/conf/common.rmk
@@@ -621,9 -634,9 +634,9 @@@ endi
  normal_mod_SOURCES = normal/main.c normal/cmdline.c normal/dyncmd.c \
        normal/auth.c normal/autofs.c  \
        normal/color.c normal/completion.c normal/datetime.c normal/menu.c \
-       normal/menu_entry.c normal/menu_text.c \
+       normal/menu_entry.c normal/menu_text.c normal/charset.c \
        normal/misc.c normal/crypto.c normal/term.c normal/context.c \
-       script/main.c script/script.c script/execute.c script/argv.c \
 -      script/main.c script/script.c script/execute.c unidata.c \
++      script/main.c script/script.c script/execute.c script/argv.c unidata.c \
        script/function.c script/lexer.c grub_script.tab.c grub_script.yy.c
  normal_mod_CFLAGS = $(COMMON_CFLAGS) $(POSIX_CFLAGS) -Wno-error
  normal_mod_LDFLAGS = $(COMMON_LDFLAGS)

diff --cc script/parser.y
Simple merge

diff --cc util/grub-script-check.c
Simple merge