Merge bk://www.ntp.org/ntp-dev

author Dave Hart <hart@ntp.org>

Mon, 7 Dec 2009 20:17:42 +0000 (20:17 +0000)

committer Dave Hart <hart@ntp.org>

Mon, 7 Dec 2009 20:17:42 +0000 (20:17 +0000)
author Dave Hart <hart@ntp.org>
Mon, 7 Dec 2009 20:17:42 +0000 (20:17 +0000)
committer Dave Hart <hart@ntp.org>
Mon, 7 Dec 2009 20:17:42 +0000 (20:17 +0000)
diff --cc ChangeLog
Simple merge
diff --cc ntpd/ntp_request.c
Simple merge
author	Dave Hart <hart@ntp.org>
	Mon, 7 Dec 2009 20:17:42 +0000 (20:17 +0000)
committer	Dave Hart <hart@ntp.org>
	Mon, 7 Dec 2009 20:17:42 +0000 (20:17 +0000)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
ntpd/ntp_request.c	patch \|	diff1 \|	diff2 \|	blob \| history