From: Dave Hart <hart@ntp.org>
Date: Fri, 8 May 2009 18:13:36 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1178
X-Git-Tag: NTP_4_2_4P7_RC7~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a76d0d0de03c18b5c905cd058b134549a2227ee;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1178
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1178-reallyforce

bk: 4a047650Ofw75S__22GAtdS1_l6qbQ
---

6a76d0d0de03c18b5c905cd058b134549a2227ee