]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
Merge mainline into ofwfb
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sat, 6 Feb 2010 15:01:18 +0000 (16:01 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Sat, 6 Feb 2010 15:01:18 +0000 (16:01 +0100)

Trivial merge