merge trunk
authorColin Watson <cjwatson@ubuntu.com>
Thu, 21 Apr 2011 09:36:09 +0000 (10:36 +0100)
committerColin Watson <cjwatson@ubuntu.com>
Thu, 21 Apr 2011 09:36:09 +0000 (10:36 +0100)
commit2e0fbe00d23dee6876605292f5feb0c2097ffade
treecabaab65f3ec1c7b5f24a025663c4d2bd8de6ef3
parent81ecffbfc19293dd6b14050c775926d9b5478eb8
parent92051871b736cde73d8755b3e29781a677ee362c
merge trunk
Makefile.util.def
grub-core/Makefile.core.def
grub-core/io/gzio.c