From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 26 Jul 2006 06:58:54 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_3P21~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff66b5d6abc723abbc5d949699d18082a6633db2;p=thirdparty%2Fntp.git

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

bk: 44c712aex7l6wJ1UCMG7r7mZyb2FPQ
---

ff66b5d6abc723abbc5d949699d18082a6633db2