Merge shiny.ad.hartbrothers.com:c:\ntp\ntp-stable-pull

author Dave Hart <hart@ntp.org>

Sat, 28 Mar 2009 09:49:15 +0000 (09:49 +0000)

committer Dave Hart <hart@ntp.org>

Sat, 28 Mar 2009 09:49:15 +0000 (09:49 +0000)
author Dave Hart <hart@ntp.org>
Sat, 28 Mar 2009 09:49:15 +0000 (09:49 +0000)
committer Dave Hart <hart@ntp.org>
Sat, 28 Mar 2009 09:49:15 +0000 (09:49 +0000)
diff --cc ntpd/ntpd.c
Simple merge
diff --cc ports/winnt/ntpd/ntp_iocompletionport.c
Simple merge
author	Dave Hart <hart@ntp.org>
	Sat, 28 Mar 2009 09:49:15 +0000 (09:49 +0000)
committer	Dave Hart <hart@ntp.org>
	Sat, 28 Mar 2009 09:49:15 +0000 (09:49 +0000)
		1	2
ntpd/ntpd.c	patch \|	diff1 \|	diff2 \|	blob \| history
ports/winnt/ntpd/ntp_iocompletionport.c	patch \|	diff1 \|	diff2 \|	blob \| history