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-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ce6ec4e0833b23f6cfdf771bcdb4e38dc79f724;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
---

1ce6ec4e0833b23f6cfdf771bcdb4e38dc79f724