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

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

bk: 44f242a0DMDsKvn0KJ2u69WFhqyLcw
---

14014fea419969397bfdd9177e61acc6782ac03c