From: Danny Mayer <mayer@ntp.org>
Date: Mon, 4 Jan 2010 04:05:21 +0000 (-0500)
Subject: Merge pogo.udel.edu:/pogo/users/mayer/ntp-stable-vc6
X-Git-Tag: NTP_4_2_7P10~5^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c20273d15a2aceba900141ba89b40853ebc7149b;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: 4b4169011BL8K0-IadK6j1n-ADNElA
---

c20273d15a2aceba900141ba89b40853ebc7149b