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

author LaMont Jones <lamont@debian.org>

Sun, 23 Sep 2007 22:13:23 +0000 (16:13 -0600)

committer LaMont Jones <lamont@debian.org>

Sun, 23 Sep 2007 22:13:23 +0000 (16:13 -0600)
author LaMont Jones <lamont@debian.org>
Sun, 23 Sep 2007 22:13:23 +0000 (16:13 -0600)
committer LaMont Jones <lamont@debian.org>
Sun, 23 Sep 2007 22:13:23 +0000 (16:13 -0600)
diff --cc mount/mount.c
Simple merge
diff --cc sys-utils/setarch.c
Simple merge
author	LaMont Jones <lamont@debian.org>
	Sun, 23 Sep 2007 22:13:23 +0000 (16:13 -0600)
committer	LaMont Jones <lamont@debian.org>
	Sun, 23 Sep 2007 22:13:23 +0000 (16:13 -0600)
		1	2
mount/mount.c	patch \|	diff1 \|	diff2 \|	blob \| history
sys-utils/setarch.c	patch \|	diff1 \|	diff2 \|	blob \| history