Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-784-jjy

author Dave Hart <hart@ntp.org>

Thu, 7 May 2009 22:20:21 +0000 (22:20 +0000)

committer Dave Hart <hart@ntp.org>

Thu, 7 May 2009 22:20:21 +0000 (22:20 +0000)
author Dave Hart <hart@ntp.org>
Thu, 7 May 2009 22:20:21 +0000 (22:20 +0000)
committer Dave Hart <hart@ntp.org>
Thu, 7 May 2009 22:20:21 +0000 (22:20 +0000)
diff --cc ChangeLog
Simple merge
diff --cc ntpd/ntp_io.c
Simple merge
author	Dave Hart <hart@ntp.org>
	Thu, 7 May 2009 22:20:21 +0000 (22:20 +0000)
committer	Dave Hart <hart@ntp.org>
	Thu, 7 May 2009 22:20:21 +0000 (22:20 +0000)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
ntpd/ntp_io.c	patch \|	diff1 \|	diff2 \|	blob \| history