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

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

bk: 4d0aa8aarnQT1BVmMkwNEKfOp4NTtA
---

7c9d24f306cbe46414dd96dd65e6ada237a61a28