Merge commit 'origin/master' into debian

author LaMont Jones <lamont@mix.mmjgroup.com>

Wed, 11 Jul 2007 21:47:17 +0000 (15:47 -0600)

committer LaMont Jones <lamont@mix.mmjgroup.com>

Wed, 11 Jul 2007 21:47:17 +0000 (15:47 -0600)
author LaMont Jones <lamont@mix.mmjgroup.com>
Wed, 11 Jul 2007 21:47:17 +0000 (15:47 -0600)
committer LaMont Jones <lamont@mix.mmjgroup.com>
Wed, 11 Jul 2007 21:47:17 +0000 (15:47 -0600)
diff --cc configure.ac
Simple merge
diff --cc mount/lomount.c
Simple merge
author	LaMont Jones <lamont@mix.mmjgroup.com>
	Wed, 11 Jul 2007 21:47:17 +0000 (15:47 -0600)
committer	LaMont Jones <lamont@mix.mmjgroup.com>
	Wed, 11 Jul 2007 21:47:17 +0000 (15:47 -0600)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
mount/lomount.c	patch \|	diff1 \|	diff2 \|	blob \| history