From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 16 Jun 2006 22:36:59 +0000 (-0400)
Subject: Merge pogo:ntp-dev-2autogen
X-Git-Tag: NTP_4_2_3P3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46f542497df4cf218d069bda122ad17f4f286833;p=thirdparty%2Fntp.git

Merge pogo:ntp-dev-2autogen
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 4493328bELhha7AMDRRDYF9jeT-jlQ
---

46f542497df4cf218d069bda122ad17f4f286833