Merge commit 'origin'

author LaMont Jones <lamont@mmjgroup.com>

Mon, 27 Aug 2007 15:35:12 +0000 (09:35 -0600)

committer LaMont Jones <lamont@mmjgroup.com>

Mon, 27 Aug 2007 15:35:12 +0000 (09:35 -0600)
author LaMont Jones <lamont@mmjgroup.com>
Mon, 27 Aug 2007 15:35:12 +0000 (09:35 -0600)
committer LaMont Jones <lamont@mmjgroup.com>
Mon, 27 Aug 2007 15:35:12 +0000 (09:35 -0600)
diff --cc configure.ac
Simple merge
diff --cc mount/lomount.c
Simple merge
diff --cc mount/mount.c
Simple merge
author	LaMont Jones <lamont@mmjgroup.com>
	Mon, 27 Aug 2007 15:35:12 +0000 (09:35 -0600)
committer	LaMont Jones <lamont@mmjgroup.com>
	Mon, 27 Aug 2007 15:35:12 +0000 (09:35 -0600)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
mount/lomount.c	patch \|	diff1 \|	diff2 \|	blob \| history
mount/mount.c	patch \|	diff1 \|	diff2 \|	blob \| history