From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Sun, 11 Jul 2010 15:44:18 +0000 (+0530)
Subject: merge with mainline
X-Git-Tag: 1.99~600^2~10^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7925f8e9cf0241d5149bb3e774bec92f8df6d32c;p=thirdparty%2Fgrub.git

merge with mainline
---

7925f8e9cf0241d5149bb3e774bec92f8df6d32c
diff --cc conf/common.rmk
index c437156b7,f92e5bc4c..4ab829470
--- a/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)