From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 24 Feb 2006 09:31:16 +0000 (-0500)
Subject: Merge deacon.udel.edu:/backroom/ntp-stable
X-Git-Tag: NTP_4_2_0B_RC1~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ac3adf47ef7bb774ab81f01791bee0afda393d8;p=thirdparty%2Fntp.git

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

bk: 43fed26490xXMwnbPetZacTtKovLvQ
---

4ac3adf47ef7bb774ab81f01791bee0afda393d8