From: LaMont Jones <lamont@debian.org>
Date: Mon, 19 Oct 2009 13:58:11 +0000 (-0600)
Subject: Merge remote branch 'origin/master'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bfb9ff5418b4cf9d98efe04c109eef18b7b73e8;p=util-linux

Merge remote branch 'origin/master'

Conflicts:
	mount/lomount.c
---

7bfb9ff5418b4cf9d98efe04c109eef18b7b73e8