From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 23 Sep 2006 07:09:08 +0000 (-0400)
Subject: Merge whimsy:/backroom/ntp-dev
X-Git-Tag: NTP_4_2_3P61_RC~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=015f830c9ad40b666b0d2eed58864120dfc7493c;p=thirdparty%2Fntp.git

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

bk: 4514dd945iuEJUE0CMMOA_K-f7WUrQ
---

015f830c9ad40b666b0d2eed58864120dfc7493c