]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
merge mainline into net
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 16 Dec 2011 17:00:16 +0000 (18:00 +0100)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 16 Dec 2011 17:00:16 +0000 (18:00 +0100)

Trivial merge