]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
merge trunk
authorColin Watson <cjwatson@ubuntu.com>
Thu, 23 Dec 2010 12:20:48 +0000 (12:20 +0000)
committerColin Watson <cjwatson@ubuntu.com>
Thu, 23 Dec 2010 12:20:48 +0000 (12:20 +0000)

Trivial merge