]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Merge branch 'master', remote-tracking branch 'upstream/master'
authorSami Kerola <kerolasa@iki.fi>
Tue, 14 Jun 2011 18:26:37 +0000 (20:26 +0200)
committerSami Kerola <kerolasa@iki.fi>
Tue, 14 Jun 2011 18:26:37 +0000 (20:26 +0200)

Trivial merge