merge trunk
authorColin Watson <cjwatson@ubuntu.com>
Tue, 4 Jan 2011 15:41:07 +0000 (15:41 +0000)
committerColin Watson <cjwatson@ubuntu.com>
Tue, 4 Jan 2011 15:41:07 +0000 (15:41 +0000)
commit944404efb8000d52eac1c292fa157b0ca48c4c2d
tree8de6325a9685dbbe9cd6b98d28c48ffe93d9af8a
parentd6f07b29fca3f555b22000fde18577a45bd42b39
parent446fa40081ab2602dcad9ebdfc4564e63fed1c76
merge trunk
Makefile.util.def
grub-core/Makefile.core.def
grub-core/io/gzio.c