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

author Dave Hart <hart@ntp.org>

Fri, 8 May 2009 02:03:40 +0000 (02:03 +0000)

committer Dave Hart <hart@ntp.org>

Fri, 8 May 2009 02:03:40 +0000 (02:03 +0000)
author Dave Hart <hart@ntp.org>
Fri, 8 May 2009 02:03:40 +0000 (02:03 +0000)
committer Dave Hart <hart@ntp.org>
Fri, 8 May 2009 02:03:40 +0000 (02:03 +0000)
diff --cc ChangeLog
Simple merge
diff --cc ntpd/cmd_args.c
Simple merge
author	Dave Hart <hart@ntp.org>
	Fri, 8 May 2009 02:03:40 +0000 (02:03 +0000)
committer	Dave Hart <hart@ntp.org>
	Fri, 8 May 2009 02:03:40 +0000 (02:03 +0000)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
ntpd/cmd_args.c	patch \|	diff1 \|	diff2 \|	blob \| history