From: Dave Hart <hart@ntp.org>
Date: Tue, 30 Nov 2010 06:45:34 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-undef
X-Git-Tag: NTP_4_2_7P87~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b97fe771622e16fb2a6a3c8a0e5481409f0180a2;p=thirdparty%2Fntp.git

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

bk: 4cf49d8eemwQ0eXVcTnLqkMUXWP80g
---

b97fe771622e16fb2a6a3c8a0e5481409f0180a2