From: LaMont Jones <lamont@mmjgroup.com>
Date: Tue, 7 Aug 2007 15:25:07 +0000 (-0600)
Subject: Merge commit 'origin'
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d84c5c9b392b5d7453b6abff94c6315268338dba;p=util-linux

Merge commit 'origin'

Conflicts:

	mount/swapon.c
---

d84c5c9b392b5d7453b6abff94c6315268338dba