Merge commit 'origin/master'

author LaMont Jones <lamont@debian.org>

Tue, 22 Sep 2009 12:20:03 +0000 (06:20 -0600)

committer LaMont Jones <lamont@debian.org>

Tue, 22 Sep 2009 12:20:03 +0000 (06:20 -0600)
author LaMont Jones <lamont@debian.org>
Tue, 22 Sep 2009 12:20:03 +0000 (06:20 -0600)
committer LaMont Jones <lamont@debian.org>
Tue, 22 Sep 2009 12:20:03 +0000 (06:20 -0600)
diff --cc lib/fsprobe.c
Simple merge
diff --cc mount/mount.8
Simple merge
author	LaMont Jones <lamont@debian.org>
	Tue, 22 Sep 2009 12:20:03 +0000 (06:20 -0600)
committer	LaMont Jones <lamont@debian.org>
	Tue, 22 Sep 2009 12:20:03 +0000 (06:20 -0600)
		1	2
lib/fsprobe.c	patch \|	diff1 \|	diff2 \|	blob \| history
mount/mount.8	patch \|	diff1 \|	diff2 \|	blob \| history