Merge commit 'origin/master'

author LaMont Jones <lamont@debian.org>

Mon, 19 May 2008 12:15:09 +0000 (06:15 -0600)

committer LaMont Jones <lamont@debian.org>

Mon, 19 May 2008 12:15:09 +0000 (06:15 -0600)
author LaMont Jones <lamont@debian.org>
Mon, 19 May 2008 12:15:09 +0000 (06:15 -0600)
committer LaMont Jones <lamont@debian.org>
Mon, 19 May 2008 12:15:09 +0000 (06:15 -0600)
diff --cc NEWS
Simple merge
diff --cc mount/mount.8
Simple merge
diff --cc sys-utils/setarch.c
Simple merge
author	LaMont Jones <lamont@debian.org>
	Mon, 19 May 2008 12:15:09 +0000 (06:15 -0600)
committer	LaMont Jones <lamont@debian.org>
	Mon, 19 May 2008 12:15:09 +0000 (06:15 -0600)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
mount/mount.8	patch \|	diff1 \|	diff2 \|	blob \| history
sys-utils/setarch.c	patch \|	diff1 \|	diff2 \|	blob \| history