Merge remote branch 'origin/stable/v2.17' into stable/v2.17

author LaMont Jones <lamont@debian.org>

Sat, 8 May 2010 10:09:40 +0000 (04:09 -0600)

committer LaMont Jones <lamont@debian.org>

Sat, 8 May 2010 10:09:40 +0000 (04:09 -0600)
author LaMont Jones <lamont@debian.org>
Sat, 8 May 2010 10:09:40 +0000 (04:09 -0600)
committer LaMont Jones <lamont@debian.org>
Sat, 8 May 2010 10:09:40 +0000 (04:09 -0600)
diff --cc mount/mount.8
Simple merge
diff --cc mount/mount.c
Simple merge
author	LaMont Jones <lamont@debian.org>
	Sat, 8 May 2010 10:09:40 +0000 (04:09 -0600)
committer	LaMont Jones <lamont@debian.org>
	Sat, 8 May 2010 10:09:40 +0000 (04:09 -0600)
		1	2
mount/mount.8	patch \|	diff1 \|	diff2 \|	blob \| history
mount/mount.c	patch \|	diff1 \|	diff2 \|	blob \| history