From: LaMont Jones <lamont@debian.org>
Date: Mon, 7 Dec 2009 00:30:07 +0000 (-0700)
Subject: Merge remote branch 'origin/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c949b48b3c1ebacb8928a3e91b084778b209a16;p=util-linux

Merge remote branch 'origin/master'

Conflicts:
	mount/mount.8
---

6c949b48b3c1ebacb8928a3e91b084778b209a16