From: Danny Mayer <mayer@ntp.org>
Date: Fri, 25 Aug 2006 19:32:07 +0000 (-0400)
Subject: Merge pogo.udel.edu:/pogo/users/mayer/ntp-stable
X-Git-Tag: NTP_4_2_3P48~7^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=080b514bd369aa8a1ca6cdb88d2575aa42318b3c;p=thirdparty%2Fntp.git

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

bk: 44ef5037XQuEHUmRKNUzpo22AZDjwQ
---

080b514bd369aa8a1ca6cdb88d2575aa42318b3c