From: Dave Hart <hart@ntp.org>
Date: Thu, 7 May 2009 07:40:04 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-784-jjy
X-Git-Tag: NTP_4_2_5P173~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b92e9f4745aad1f16704e993bcedad281d065e90;p=thirdparty%2Fntp.git

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

bk: 4a029054c1jd7zUEF-M565vIAGdw8A
---

b92e9f4745aad1f16704e993bcedad281d065e90