Merge remote branch 'origin/master'

author LaMont Jones <lamont@debian.org>

Wed, 4 Nov 2009 21:50:31 +0000 (14:50 -0700)

committer LaMont Jones <lamont@debian.org>

Wed, 4 Nov 2009 21:50:31 +0000 (14:50 -0700)
author LaMont Jones <lamont@debian.org>
Wed, 4 Nov 2009 21:50:31 +0000 (14:50 -0700)
committer LaMont Jones <lamont@debian.org>
Wed, 4 Nov 2009 21:50:31 +0000 (14:50 -0700)
diff --cc lib/fsprobe.c
Simple merge
diff --cc mount/mount.8
Simple merge
author	LaMont Jones <lamont@debian.org>
	Wed, 4 Nov 2009 21:50:31 +0000 (14:50 -0700)
committer	LaMont Jones <lamont@debian.org>
	Wed, 4 Nov 2009 21:50:31 +0000 (14:50 -0700)
		1	2
lib/fsprobe.c	patch \|	diff1 \|	diff2 \|	blob \| history
mount/mount.8	patch \|	diff1 \|	diff2 \|	blob \| history