Merge commit 'origin/stable/v2.15' into stable/v2.15

author LaMont Jones <lamont@debian.org>

Fri, 29 May 2009 09:15:56 +0000 (03:15 -0600)

committer LaMont Jones <lamont@debian.org>

Fri, 29 May 2009 09:15:56 +0000 (03:15 -0600)
author LaMont Jones <lamont@debian.org>
Fri, 29 May 2009 09:15:56 +0000 (03:15 -0600)
committer LaMont Jones <lamont@debian.org>
Fri, 29 May 2009 09:15:56 +0000 (03:15 -0600)
diff --cc mount/lomount.c
Simple merge
diff --cc mount/mount.c
Simple merge
author	LaMont Jones <lamont@debian.org>
	Fri, 29 May 2009 09:15:56 +0000 (03:15 -0600)
committer	LaMont Jones <lamont@debian.org>
	Fri, 29 May 2009 09:15:56 +0000 (03:15 -0600)
		1	2
mount/lomount.c	patch \|	diff1 \|	diff2 \|	blob \| history
mount/mount.c	patch \|	diff1 \|	diff2 \|	blob \| history