From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 30 Aug 2006 04:46:31 +0000 (-0400)
Subject: Merge whimsy:/backroom/ntp-dev
X-Git-Tag: NTP_4_2_3P61_RC~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ee27aba8c0893e66587628d9f4bf8b9f9ea962b;p=thirdparty%2Fntp.git

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

bk: 44f51827Cjghe9nHzByov9q59sID5g
---

8ee27aba8c0893e66587628d9f4bf8b9f9ea962b