From: Dave Hart <hart@ntp.org>
Date: Mon, 6 Dec 2010 08:03:28 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1738
X-Git-Tag: NTP_4_2_7P91~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dd96eb0c581b6df7fa85b3b0dc8895cf06f17cd;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: 4cfc98d0Jxhs0yufIhXyxKVJRTkEEQ
---

5dd96eb0c581b6df7fa85b3b0dc8895cf06f17cd