From: Dave Hart <hart@ntp.org>
Date: Thu, 16 Dec 2010 06:20:26 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1754
X-Git-Tag: NTP_4_2_7P95~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b85a859a8bb59651ec0baaeaab29ac883e6173f9;p=thirdparty%2Fntp.git

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

bk: 4d09afaaZ2l1KI6nbG_IScxl547dmA
---

b85a859a8bb59651ec0baaeaab29ac883e6173f9