From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 17 Mar 2006 09:33:11 +0000 (-0500)
Subject: Merge pogo:/usa/mayer/ntp-dev
X-Git-Tag: NTP_4_2_3~18^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6868f76a92581e0a44908edb24d6f922d63e808;p=thirdparty%2Fntp.git

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

bk: 441a82578ZQKsiYeCGnOWmeyd4W_gw
---

a6868f76a92581e0a44908edb24d6f922d63e808