From: Danny Mayer <mayer@ntp.org>
Date: Sun, 3 Jan 2010 03:41:50 +0000 (-0500)
Subject: Merge pogo.udel.edu:/pogo/users/mayer/ntp-stable-vc6
X-Git-Tag: NTP_4_2_7P10~5^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20c879d36db2d2e38a412724f1f0a84ae73e89fe;p=thirdparty%2Fntp.git

Merge pogo.udel.edu:/pogo/users/mayer/ntp-stable-vc6
into  pogo.udel.edu:/pogo/users/mayer/ntp-dev-1448-1450

bk: 4b4011fe-i2BE6YMI8FP4zbxLe2Oeg
---

20c879d36db2d2e38a412724f1f0a84ae73e89fe