From: Dave Hart <hart@ntp.org>
Date: Mon, 20 Dec 2010 21:20:41 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1757
X-Git-Tag: NTP_4_2_7P99~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae77a7746f3b8674c30ab93bc54744a7da5d76dd;p=thirdparty%2Fntp.git

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

bk: 4d0fc8a90iyKOnl7MtKvD0XoY9Jr4w
---

ae77a7746f3b8674c30ab93bc54744a7da5d76dd