From: Dave Hart <hart@ntp.org>
Date: Mon, 1 Nov 2010 00:22:49 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1691
X-Git-Tag: NTP_4_2_7P76~2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9590302caf00d681b93eea79636aeb63110628b9;p=thirdparty%2Fntp.git

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

bk: 4cce0859ux_rs67j2v_ffkss1bKcwA
---

9590302caf00d681b93eea79636aeb63110628b9