Merge from trunk

diff --cc conf/i386-coreboot.rmk
Simple merge

diff --cc conf/i386-pc.rmk
Simple merge

diff --cc conf/powerpc-ieee1275.rmk
Simple merge

diff --cc loader/i386/efi/linux.c
Simple merge

diff --cc loader/i386/linux.c
index 863090025eceda48dd7f062230741fab5baf11db,7c4b061b8ef80265a503ddd5785ecd981dea8875..43c455cd66b4a2eab6fcf0a31f8ab686707600f5
--- 1/loader/i386/linux.c
--- 2/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