From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 18 Jun 2006 02:40:50 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_3P4~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ce79fdab89b14a266dbe8f3a3e0d458684eddc4;p=thirdparty%2Fntp.git

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

bk: 4494bd32CDEKbuZFKMkgwKE2LqEU1w
---

8ce79fdab89b14a266dbe8f3a3e0d458684eddc4