Merge commit 'v2.14'

author LaMont Jones <lamont@debian.org>

Mon, 16 Jun 2008 13:36:21 +0000 (07:36 -0600)

committer LaMont Jones <lamont@debian.org>

Mon, 16 Jun 2008 13:36:21 +0000 (07:36 -0600)
author LaMont Jones <lamont@debian.org>
Mon, 16 Jun 2008 13:36:21 +0000 (07:36 -0600)
committer LaMont Jones <lamont@debian.org>
Mon, 16 Jun 2008 13:36:21 +0000 (07:36 -0600)
diff --cc NEWS
Simple merge
diff --cc mount/mount.8
Simple merge
author	LaMont Jones <lamont@debian.org>
	Mon, 16 Jun 2008 13:36:21 +0000 (07:36 -0600)
committer	LaMont Jones <lamont@debian.org>
	Mon, 16 Jun 2008 13:36:21 +0000 (07:36 -0600)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
mount/mount.8	patch \|	diff1 \|	diff2 \|	blob \| history