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

author LaMont Jones <lamont@debian.org>

Mon, 7 Dec 2009 00:30:27 +0000 (17:30 -0700)

committer LaMont Jones <lamont@debian.org>

Mon, 7 Dec 2009 00:30:27 +0000 (17:30 -0700)
author LaMont Jones <lamont@debian.org>
Mon, 7 Dec 2009 00:30:27 +0000 (17:30 -0700)
committer LaMont Jones <lamont@debian.org>
Mon, 7 Dec 2009 00:30:27 +0000 (17:30 -0700)
diff --cc configure.ac
Simple merge
diff --cc hwclock/hwclock.c
Simple merge
diff --cc mount/mount.8
Simple merge
diff --cc text-utils/tailf.c
Simple merge
author	LaMont Jones <lamont@debian.org>
	Mon, 7 Dec 2009 00:30:27 +0000 (17:30 -0700)
committer	LaMont Jones <lamont@debian.org>
	Mon, 7 Dec 2009 00:30:27 +0000 (17:30 -0700)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
hwclock/hwclock.c	patch \|	diff1 \|	diff2 \|	blob \| history
mount/mount.8	patch \|	diff1 \|	diff2 \|	blob \| history
text-utils/tailf.c	patch \|	diff1 \|	diff2 \|	blob \| history