From: Dave Hart <hart@ntp.org>
Date: Fri, 16 Apr 2010 14:05:57 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1503-04-18-22
X-Git-Tag: NTP_4_2_7P25~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be1e71d85fc864313ef6acd0eee09f79d84d6ace;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1503-04-18-22
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1503-04-18-22

bk: 4bc86ec5qe-HwhdpIMcZPRYtcrt4VQ
---

be1e71d85fc864313ef6acd0eee09f79d84d6ace