From: Dave Hart <hart@ntp.org>
Date: Wed, 27 Jul 2011 22:23:06 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1978
X-Git-Tag: NTP_4_2_7P197~1^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a63855c7b7a2a8a91d1f3ca826b37e262b7a0d33;p=thirdparty%2Fntp.git

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

bk: 4e308fca_8zzVs5gtiTrcLBkF-n52A
---

a63855c7b7a2a8a91d1f3ca826b37e262b7a0d33