From: Dave Hart <hart@ntp.org>
Date: Thu, 7 May 2009 22:20:21 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-784-jjy
X-Git-Tag: NTP_4_2_5P173~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56b95005e36ddbc754e4d9a35d8b3ab333f80801;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: 4a035ea5mIPElqArMHK3js4NUFshpQ
---

56b95005e36ddbc754e4d9a35d8b3ab333f80801