From: Dave Hart <hart@ntp.org>
Date: Fri, 17 Dec 2010 02:36:28 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-libopts-33.5.8
X-Git-Tag: NTP_4_2_7P95~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2386aebed46e9f1a4f9b365cc296e4eb37223d9d;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-libopts-33.5.8
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-libopts-33.5.8

bk: 4d0accacLzlP4Bs5NjY8ehM1R7uvkQ
---

2386aebed46e9f1a4f9b365cc296e4eb37223d9d