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-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7363bced203cb624cb6a4f7a705f9dd4eef97644;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
---

7363bced203cb624cb6a4f7a705f9dd4eef97644