merge mainline into mips

diff --cc Makefile.in
Simple merge

diff --cc conf/any-emu.rmk
Simple merge

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

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

diff --cc conf/i386-pc.rmk
index 9fc4b8df07a4d2f1d6be7fe650de28bf4b749fdf,7e54b3b6775188a5e3e6201097fa9a2e6365f138..fb190c82b045f01d06850e7b6b3548838e99cea2
--- 1/conf/i386-pc.rmk
--- 2/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@@ -81,10 -81,10 +81,10 @@@ kernel_syms.lst: $(addprefix include/gr
  
  # Utilities.
  bin_UTILITIES = grub-mkimage
- sbin_UTILITIES = grub-setup grub-mkdevicemap
+ sbin_UTILITIES = grub-setup
  
  # For grub-mkimage.
 -grub_mkimage_SOURCES = gnulib/progname.c util/i386/pc/grub-mkimage.c util/misc.c \
 +grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c util/misc.c \
        util/resolve.c lib/LzmaEnc.c lib/LzFind.c
  grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
  util/i386/pc/grub-mkimage.c_DEPENDENCIES = Makefile

diff --cc configure.ac
Simple merge

diff --cc util/elf/grub-mkimage.c
index ea5a1f64e86c9becc82bff2ca11082db17319f67,5750543adee4b8f3debabf9c4af13c1d33f2b4fe..7427997d3eae3cc933e432479733633e24eb01d1
--- 1/util/elf/grub-mkimage.c
--- 2/util/elf/grub-mkimage.c
+++ b/util/elf/grub-mkimage.c
@@@ -378,10 -358,12 +381,13 @@@ main (int argc, char *argv[]
    char *dir = NULL;
    char *prefix = NULL;
    char *memdisk = NULL;
 +  char *config = NULL;
    int chrp = 0;
  
-   progname = "grub-mkimage";
+   set_program_name (argv[0]);
+   setlocale (LC_ALL, "");
+   bindtextdomain (PACKAGE, LOCALEDIR);
+   textdomain (PACKAGE);
  
    while (1)
      {