From: Scott James Remnant <scott@ubuntu.com>
Date: Thu, 7 May 2009 11:30:19 +0000 (+0100)
Subject: Merge commit 'lamont/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88ccf7de108206e83092b57c4da270d470775e58;p=util-linux

Merge commit 'lamont/master'

Conflicts:
	debian/changelog
---

88ccf7de108206e83092b57c4da270d470775e58