From: Robert Millan <rmh@aybabtu.com>
Date: Sat, 9 Jan 2010 22:22:48 +0000 (+0100)
Subject: Merge from trunk
X-Git-Tag: 1.98~202^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75cc5b682e874d25d0378f13d1bd711b8f940f98;p=thirdparty%2Fgrub.git

Merge from trunk
---

75cc5b682e874d25d0378f13d1bd711b8f940f98
diff --cc loader/i386/linux.c
index 863090025,7c4b061b8..43c455cd6
--- a/loader/i386/linux.c
+++ b/loader/i386/linux.c
@@@ -33,7 -33,7 +33,8 @@@
  #include <grub/video_fb.h>
  #include <grub/command.h>
  #include <grub/i386/pc/vbe.h>
 +#include <grub/i386/pc/console.h>
+ #include <grub/i18n.h>
  
  #define GRUB_LINUX_CL_OFFSET		0x1000
  #define GRUB_LINUX_CL_END_OFFSET	0x2000