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

1d0ffe20d3ee3f323b9f3ec254c81bfab7eb4164