From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 30 Nov 2004 03:49:41 +0000 (-0500)
Subject: Merge pogo:/usa/mayer/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bcb414e5bca131aef8634d7ea0bc9efea69bce0;p=thirdparty%2Fntp.git

Merge pogo:/usa/mayer/ntp-dev
into whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 41abedd54b9MMtJLYAiOOnjNyQ9mag
---

6bcb414e5bca131aef8634d7ea0bc9efea69bce0