merge trunk

diff --cc grub-core/Makefile.core.def
Simple merge

diff --cc grub-core/io/gzio.c
index 8b813fed3991361659d92e9b3a759f97fbd2abf8,47df23833af184469ecba004f403d558116486b7..84e494d83b3834312ac885a0934e7593f4fcb3d8
--- 1/grub-core/io/gzio.c
--- 2/grub-core/io/gzio.c
+++ b/grub-core/io/gzio.c
@@@ -1151,9 -1136,9 +1151,9 @@@ grub_gzio_open (grub_file_t io
    file->data = gzio;
    file->read_hook = 0;
    file->fs = &grub_gzio_fs;
-   file->not_easly_seekable = 1;
+   file->not_easily_seekable = 1;
  
 -  if (! test_header (file))
 +  if (! test_gzip_header (file))
      {
        grub_free (gzio);
        grub_free (file);

diff --cc grub-core/kern/emu/getroot.c
Simple merge