]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
merge trunk
authorSzymon Janc <szymon@janc.net.pl>
Sat, 20 Aug 2011 10:02:35 +0000 (12:02 +0200)
committerSzymon Janc <szymon@janc.net.pl>
Sat, 20 Aug 2011 10:02:35 +0000 (12:02 +0200)

Trivial merge