From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 20 Aug 2006 06:37:04 +0000 (-0400)
Subject: Merge whimsy:/backroom/ntp-dev
X-Git-Tag: NTP_4_2_3P61_RC~17^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc22ce3446398dbea02e84a795e4ad3a5ddce2dc;p=thirdparty%2Fntp.git

Merge whimsy:/backroom/ntp-dev
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 44e80310Kxxkr_i16XZlm_OLZSYVGQ
---

fc22ce3446398dbea02e84a795e4ad3a5ddce2dc