From: Dave Hart <hart@ntp.org>
Date: Mon, 6 Dec 2010 02:14:08 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1738
X-Git-Tag: NTP_4_2_7P90~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5834d9f2cdc09958f9381d1a8d5e5fe6c16d7899;p=thirdparty%2Fntp.git

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

bk: 4cfc46f0ikSiwG1S0b1kv7h5jdK94A
---

5834d9f2cdc09958f9381d1a8d5e5fe6c16d7899