From: Dave Hart <hart@ntp.org>
Date: Sat, 10 Apr 2010 03:30:30 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1520
X-Git-Tag: NTP_4_2_7P24~2^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c42f4375e8fe8c05e9bae58d08dfa2db389ee69;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1520
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1518-20-22

bk: 4bbff0d6EhrLMUQgmzbKngffrl24tQ
---

5c42f4375e8fe8c05e9bae58d08dfa2db389ee69