]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
merge trunk
authorColin Watson <cjwatson@ubuntu.com>
Wed, 5 Jan 2011 11:57:17 +0000 (11:57 +0000)
committerColin Watson <cjwatson@ubuntu.com>
Wed, 5 Jan 2011 11:57:17 +0000 (11:57 +0000)
1  2 
util/grub-setup.c

Simple merge