From: Colin Watson <cjwatson@ubuntu.com>
Date: Thu, 21 Apr 2011 09:36:09 +0000 (+0100)
Subject: merge trunk
X-Git-Tag: 2.00~1228^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e0fbe00d23dee6876605292f5feb0c2097ffade;p=thirdparty%2Fgrub.git

merge trunk
---

2e0fbe00d23dee6876605292f5feb0c2097ffade
diff --cc grub-core/io/gzio.c
index 61227b4fc,1397a7286..5d3e5332e
--- a/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
   *