]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Merge branch 'master' into sfdisk
authorSami Kerola <kerolasa@iki.fi>
Sat, 25 Jun 2011 16:32:34 +0000 (18:32 +0200)
committerSami Kerola <kerolasa@iki.fi>
Sat, 25 Jun 2011 16:32:34 +0000 (18:32 +0200)

Trivial merge