From: Dave Hart <hart@ntp.org>
Date: Tue, 1 Sep 2009 08:24:08 +0000 (+0000)
Subject: Merge pogo:/usa/mayer/ntp-dev-windowscomp2
X-Git-Tag: NTP_4_2_5P209~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25a4d7879b288548985358d46cebd560901a5dbf;p=thirdparty%2Fntp.git

Merge pogo:/usa/mayer/ntp-dev-windowscomp2
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1289-repair

bk: 4a9cda28FNl8jTO1Fs2PGoOd6WDBiw
---

25a4d7879b288548985358d46cebd560901a5dbf