From: Dave Hart <hart@ntp.org>
Date: Sun, 19 Dec 2010 00:51:01 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-libopts-upstream
X-Git-Tag: NTP_4_2_7P97~3^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dacd64fcf0299b4829787f9ff75d87dc617fa24;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-libopts-upstream
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1458

bk: 4d0d56f5ftViWreNO3QEUniSRjIP9A
---

8dacd64fcf0299b4829787f9ff75d87dc617fa24