]> git.proxmox.com Git - grub2.git/commitdiff
merge trunk
authorColin Watson <cjwatson@ubuntu.com>
Tue, 11 Jan 2011 16:00:45 +0000 (10:00 -0600)
committerColin Watson <cjwatson@ubuntu.com>
Tue, 11 Jan 2011 16:00:45 +0000 (10:00 -0600)
1  2 
grub-core/Makefile.core.def

Simple merge