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

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-libopts-33.5.8

bk: 4d0acc5b7tME-p2h4JLz-kIyDIvwqw
---

de77b59c602cbd875187b5671e3330671ecaa04e