]> err.no Git - util-linux/commitdiff
Merge commit 'lamont/master'
authorScott James Remnant <scott@ubuntu.com>
Thu, 7 May 2009 11:30:19 +0000 (12:30 +0100)
committerScott James Remnant <scott@ubuntu.com>
Thu, 7 May 2009 11:30:19 +0000 (12:30 +0100)
Conflicts:
debian/changelog


Trivial merge