Merge whimsy.udel.edu:/deacon/backroom/ntp-stable

author Harlan Stenn <stenn@ntp.org>

Sun, 20 Dec 2009 02:52:27 +0000 (21:52 -0500)

committer Harlan Stenn <stenn@ntp.org>

Sun, 20 Dec 2009 02:52:27 +0000 (21:52 -0500)
author Harlan Stenn <stenn@ntp.org>
Sun, 20 Dec 2009 02:52:27 +0000 (21:52 -0500)
committer Harlan Stenn <stenn@ntp.org>
Sun, 20 Dec 2009 02:52:27 +0000 (21:52 -0500)
diff --cc ChangeLog
Simple merge
diff --cc configure.ac
Simple merge
diff --cc ntpsnmpd/Makefile.am
Simple merge
author	Harlan Stenn <stenn@ntp.org>
	Sun, 20 Dec 2009 02:52:27 +0000 (21:52 -0500)
committer	Harlan Stenn <stenn@ntp.org>
	Sun, 20 Dec 2009 02:52:27 +0000 (21:52 -0500)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
ntpsnmpd/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history