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

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

bk: 44ef45951SdvbMWu-M9gyAuL4qsZew
---

1bfcd52edb7ba5b0f53146e0f63edef5553f2710