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-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32bbfb2c22d7d7ad320ba96e1939f63ac9e808a0;p=thirdparty%2Fntp.git

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

bk: 4678c196Rg0PjPo5XQycbsRSY7fRew
---

32bbfb2c22d7d7ad320ba96e1939f63ac9e808a0