From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 11 Oct 2006 02:26:20 +0000 (-0400)
Subject: Merge whimsy:/backroom/ntp-dev
X-Git-Tag: NTP_4_2_3P61_RC~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6260c2434e1441c32653b925ca4f4d510511e5be;p=thirdparty%2Fntp.git

Merge whimsy:/backroom/ntp-dev
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 452c564cZlDK2lVanPm7u4eHwtAWuQ
---

6260c2434e1441c32653b925ca4f4d510511e5be