From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 11 Aug 2006 02:01:29 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_3P30~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ae799317eb22201146eea002167ed4e664c81c0;p=thirdparty%2Fntp.git

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

bk: 44dbe4f9FGVwpTOnU-1-OHcO2SxNSg
---

0ae799317eb22201146eea002167ed4e664c81c0