Merge angel.cids.org.za:/home/ntp/ntp-dev-ipv6

author John Hay <hay@ntp.org>

Tue, 9 Oct 2001 19:31:44 +0000 (21:31 +0200)

committer John Hay <hay@ntp.org>

Tue, 9 Oct 2001 19:31:44 +0000 (21:31 +0200)
author John Hay <hay@ntp.org>
Tue, 9 Oct 2001 19:31:44 +0000 (21:31 +0200)
committer John Hay <hay@ntp.org>
Tue, 9 Oct 2001 19:31:44 +0000 (21:31 +0200)
diff --cc configure.in
Simple merge
diff --cc ntpd/ntp_control.c
Simple merge
author	John Hay <hay@ntp.org>
	Tue, 9 Oct 2001 19:31:44 +0000 (21:31 +0200)
committer	John Hay <hay@ntp.org>
	Tue, 9 Oct 2001 19:31:44 +0000 (21:31 +0200)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
ntpd/ntp_control.c	patch \|	diff1 \|	diff2 \|	blob \| history