From: LaMont Jones <lamont@debian.org>
Date: Tue, 22 Sep 2009 12:20:03 +0000 (-0600)
Subject: Merge commit 'origin/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=107785f0d67fd58be21799eaf40135b2afb2ef60;p=util-linux

Merge commit 'origin/master'

Conflicts:
	mount/mount.8
---

107785f0d67fd58be21799eaf40135b2afb2ef60