Merge commit 'origin/master'

author LaMont Jones <lamont@debian.org>

Sun, 24 Aug 2008 04:38:18 +0000 (22:38 -0600)

committer LaMont Jones <lamont@debian.org>

Sun, 24 Aug 2008 04:38:18 +0000 (22:38 -0600)
author LaMont Jones <lamont@debian.org>
Sun, 24 Aug 2008 04:38:18 +0000 (22:38 -0600)
committer LaMont Jones <lamont@debian.org>
Sun, 24 Aug 2008 04:38:18 +0000 (22:38 -0600)
diff --cc mount/lomount.c
Simple merge
diff --cc mount/mount.8
Simple merge
diff --cc mount/swapon.c
Simple merge
author	LaMont Jones <lamont@debian.org>
	Sun, 24 Aug 2008 04:38:18 +0000 (22:38 -0600)
committer	LaMont Jones <lamont@debian.org>
	Sun, 24 Aug 2008 04:38:18 +0000 (22:38 -0600)
		1	2
mount/lomount.c	patch \|	diff1 \|	diff2 \|	blob \| history
mount/mount.8	patch \|	diff1 \|	diff2 \|	blob \| history
mount/swapon.c	patch \|	diff1 \|	diff2 \|	blob \| history