From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 20 Jun 2007 05:56:38 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_5P53~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e6ce15f50cb5fb5c61c115c21890f6672dfe796;p=thirdparty%2Fntp.git

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

bk: 4678c196Rg0PjPo5XQycbsRSY7fRew
---

5e6ce15f50cb5fb5c61c115c21890f6672dfe796