]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
merge mainline into net
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 24 Jun 2011 20:20:50 +0000 (22:20 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 24 Jun 2011 20:20:50 +0000 (22:20 +0200)

Trivial merge