]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
merge from mainline
authorColin Watson <cjwatson@ubuntu.com>
Thu, 27 May 2010 15:36:31 +0000 (16:36 +0100)
committerColin Watson <cjwatson@ubuntu.com>
Thu, 27 May 2010 15:36:31 +0000 (16:36 +0100)

Trivial merge