From: Dave Hart <hart@ntp.org>
Date: Sun, 19 Dec 2010 03:43:43 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1458
X-Git-Tag: NTP_4_2_7P97~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbf0899154bc14c40b165b3b8360aad7ccd6aef5;p=thirdparty%2Fntp.git

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

bk: 4d0d7f6fBoSPq9YociryvHRquYqGrA
---

fbf0899154bc14c40b165b3b8360aad7ccd6aef5