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

author Dave Hart <hart@ntp.org>

Tue, 30 Nov 2010 06:45:34 +0000 (06:45 +0000)

committer Dave Hart <hart@ntp.org>

Tue, 30 Nov 2010 06:45:34 +0000 (06:45 +0000)
author Dave Hart <hart@ntp.org>
Tue, 30 Nov 2010 06:45:34 +0000 (06:45 +0000)
committer Dave Hart <hart@ntp.org>
Tue, 30 Nov 2010 06:45:34 +0000 (06:45 +0000)
diff --cc configure.ac
Simple merge
diff --cc sntp/configure.ac
Simple merge
author	Dave Hart <hart@ntp.org>
	Tue, 30 Nov 2010 06:45:34 +0000 (06:45 +0000)
committer	Dave Hart <hart@ntp.org>
	Tue, 30 Nov 2010 06:45:34 +0000 (06:45 +0000)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
sntp/configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history