Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev

author Harlan Stenn <stenn@ntp.org>

Fri, 5 May 2006 09:46:33 +0000 (05:46 -0400)

committer Harlan Stenn <stenn@ntp.org>

Fri, 5 May 2006 09:46:33 +0000 (05:46 -0400)
author Harlan Stenn <stenn@ntp.org>
Fri, 5 May 2006 09:46:33 +0000 (05:46 -0400)
committer Harlan Stenn <stenn@ntp.org>
Fri, 5 May 2006 09:46:33 +0000 (05:46 -0400)
diff --cc Makefile.am
Simple merge
diff --cc configure.ac
Simple merge
diff --cc ntpd/ntpd.c
Simple merge
author	Harlan Stenn <stenn@ntp.org>
	Fri, 5 May 2006 09:46:33 +0000 (05:46 -0400)
committer	Harlan Stenn <stenn@ntp.org>
	Fri, 5 May 2006 09:46:33 +0000 (05:46 -0400)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
ntpd/ntpd.c	patch \|	diff1 \|	diff2 \|	blob \| history