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

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

bk: 44d7c26cLX76U9RgJvHGayYvBFjPPA
---

5696bb89b2caeb60b86315092b800e99020a50b6