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-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa87ae1afc385c90dca90a7fe5ee6599889d6f18;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
---

fa87ae1afc385c90dca90a7fe5ee6599889d6f18