From: Dave Hart <hart@ntp.org>
Date: Mon, 7 Dec 2009 20:17:42 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_6_RC~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3540c3b30a9d3821af6e01b92d974da9af1572c4;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1331

bk: 4b1d62e6ys_-UFrkcGEaIpkiSifFCw
---

3540c3b30a9d3821af6e01b92d974da9af1572c4