merge trunk

diff --cc Makefile.util.def
Simple merge

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

diff --cc grub-core/io/gzio.c
index 61227b4fc8602d824dd580a4d10b6fd076868a9a,1397a72861eb6d368ae6a41338aa311c233f6561..5d3e5332e060333240e9947c5dca1b4e074d2560
--- 1/grub-core/io/gzio.c
--- 2/grub-core/io/gzio.c
+++ b/grub-core/io/gzio.c
@@@ -41,9 -41,10 +41,11 @@@
  #include <grub/fs.h>
  #include <grub/file.h>
  #include <grub/dl.h>
 +#include <grub/disk.h>
  #include <grub/deflate.h>
  
+ GRUB_MOD_LICENSE ("GPLv3+");
+ 
  /*
   *  Window Size
   *