From: Dave Hart <hart@ntp.org>
Date: Mon, 28 Mar 2011 14:10:16 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1732
X-Git-Tag: NTP_4_2_7P143~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2586c38f35f6b2f9c43aa2d3fcd58a8a285c13b6;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1732
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1861

bk: 4d9096c8DGmARZ_8lG5HLdAaQyX75A
---

2586c38f35f6b2f9c43aa2d3fcd58a8a285c13b6