From: Dave Hart <hart@ntp.org>
Date: Sat, 26 Nov 2011 19:49:25 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2050
X-Git-Tag: NTP_4_2_6P5_RC2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abe3c83c0cc5a37c76a652990298a42c9289187b;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2050
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-2050-59-66-68-69

bk: 4ed142c5MsN9_VdVSQYISumRqE7jFw
---

abe3c83c0cc5a37c76a652990298a42c9289187b