From: Dave Hart <hart@ntp.org>
Date: Sat, 2 May 2009 04:37:21 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-cachever
X-Git-Tag: NTP_4_2_5P170~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4447f7687b2c390278872a899e6e75fccb8e83ae;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-cachever
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1172-cachever

bk: 49fbce01W5oMHCEmh7leo2WPo_-JPw
---

4447f7687b2c390278872a899e6e75fccb8e83ae