From: Dave Hart <hart@ntp.org>
Date: Tue, 6 Apr 2010 05:38:32 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1518
X-Git-Tag: NTP_4_2_7P24~2^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fdef37be6407fb7f2d45fad5a66c9efd83f5334;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1518
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1518

bk: 4bbac8d8GxWQnGSh4m0h3PQPrVLJmQ
---

1fdef37be6407fb7f2d45fad5a66c9efd83f5334