From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 10 Aug 2006 05:17:46 +0000 (-0400)
Subject: Merge whimsy:/backroom/ntp-dev
X-Git-Tag: NTP_4_2_3P61_RC~17^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58342e2be9663a1c58ae363abcf3304784c1ac12;p=thirdparty%2Fntp.git

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

bk: 44dac17acjxoPu_lhkJ4XNVRwjUJzg
---

58342e2be9663a1c58ae363abcf3304784c1ac12