From: Dave Hart <hart@ntp.org>
Date: Wed, 15 Dec 2010 08:33:15 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1618-1719
X-Git-Tag: NTP_4_2_7P94~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=267735e1541bdf8b542e8ddae59bcf770ef6af72;p=thirdparty%2Fntp.git

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

bk: 4d087d4bpAypSvHOJpx43WxXoq8-RQ
---

267735e1541bdf8b542e8ddae59bcf770ef6af72