From: Dave Hart <hart@ntp.org>
Date: Mon, 22 Nov 2010 23:02:08 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1725
X-Git-Tag: NTP_4_2_7P85~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6a5e67f085385e6ff1b1c0d7bc844132b91ea97;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1725
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-bs-no-recursive

bk: 4ceaf670dJC77OB6seMlhAqFlmQOVw
---

e6a5e67f085385e6ff1b1c0d7bc844132b91ea97