Merge commit 'origin/master'

author LaMont Jones <lamont@debian.org>

Wed, 21 Nov 2007 23:13:04 +0000 (16:13 -0700)

committer LaMont Jones <lamont@debian.org>

Wed, 21 Nov 2007 23:13:04 +0000 (16:13 -0700)
author LaMont Jones <lamont@debian.org>
Wed, 21 Nov 2007 23:13:04 +0000 (16:13 -0700)
committer LaMont Jones <lamont@debian.org>
Wed, 21 Nov 2007 23:13:04 +0000 (16:13 -0700)
diff --cc mount/Makefile.am
Simple merge
diff --cc mount/mount.c
Simple merge
author	LaMont Jones <lamont@debian.org>
	Wed, 21 Nov 2007 23:13:04 +0000 (16:13 -0700)
committer	LaMont Jones <lamont@debian.org>
	Wed, 21 Nov 2007 23:13:04 +0000 (16:13 -0700)
		1	2
mount/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
mount/mount.c	patch \|	diff1 \|	diff2 \|	blob \| history