]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
merge mainline
authorColin Watson <cjwatson@ubuntu.com>
Sat, 12 Jun 2010 14:01:46 +0000 (15:01 +0100)
committerColin Watson <cjwatson@ubuntu.com>
Sat, 12 Jun 2010 14:01:46 +0000 (15:01 +0100)

Trivial merge