From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 21 Dec 2005 03:20:53 +0000 (-0500)
Subject: Merge deacon.udel.edu:/backroom/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7cedf4e23de51211e843458c799adf7a8ad6fdc;p=thirdparty%2Fntp.git

Merge deacon.udel.edu:/backroom/ntp-stable
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 43a8ca15QoUkE9nErLzy2lIsjFMSfg
---

a7cedf4e23de51211e843458c799adf7a8ad6fdc