From: Dave Hart <hart@ntp.org>
Date: Sun, 17 May 2009 10:28:13 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1174-90
X-Git-Tag: NTP_4_2_5P177~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32bddb52783a1bcecd993730593829caa8a23ffc;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1174-90
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1174-90-1-licfix

bk: 4a0fe6bdxNOtl9M7clzY-hTTPP55zg
---

32bddb52783a1bcecd993730593829caa8a23ffc