From: Dave Hart <hart@ntp.org>
Date: Thu, 14 Oct 2010 14:49:07 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1584
X-Git-Tag: NTP_4_2_7P64~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbb4a5717685d6de9131ab5b9b435296669ad4e9;p=thirdparty%2Fntp.git

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

bk: 4cb71863LWiQFvfJ5CgdvbTPO_laYQ
---

bbb4a5717685d6de9131ab5b9b435296669ad4e9