From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 9 May 2006 07:24:47 +0000 (-0400)
Subject: Merge pogo:/usa/kardel/main-line/ntp-dev
X-Git-Tag: NTP_4_2_1P250_RC~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f8c1511f0d26c9fd1214873d4d0b3aff104fb59;p=thirdparty%2Fntp.git

Merge pogo:/usa/kardel/main-line/ntp-dev
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 446043bft0AT4K8vTzWJDG2hGnk7sQ
---

3f8c1511f0d26c9fd1214873d4d0b3aff104fb59