Merge remote branch 'origin/master'

author LaMont Jones <lamont@debian.org>

Mon, 18 Oct 2010 12:49:27 +0000 (06:49 -0600)

committer LaMont Jones <lamont@debian.org>

Mon, 18 Oct 2010 12:49:27 +0000 (06:49 -0600)
author LaMont Jones <lamont@debian.org>
Mon, 18 Oct 2010 12:49:27 +0000 (06:49 -0600)
committer LaMont Jones <lamont@debian.org>
Mon, 18 Oct 2010 12:49:27 +0000 (06:49 -0600)
diff --cc mount/Makefile.am
Simple merge
diff --cc mount/mount.8
Simple merge
diff --cc mount/mount.c
Simple merge
author	LaMont Jones <lamont@debian.org>
	Mon, 18 Oct 2010 12:49:27 +0000 (06:49 -0600)
committer	LaMont Jones <lamont@debian.org>
	Mon, 18 Oct 2010 12:49:27 +0000 (06:49 -0600)
		1	2
mount/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
mount/mount.8	patch \|	diff1 \|	diff2 \|	blob \| history
mount/mount.c	patch \|	diff1 \|	diff2 \|	blob \| history