From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 22 Sep 2006 23:13:40 +0000 (-0400)
Subject: Merge whimsy:/backroom/ntp-dev
X-Git-Tag: NTP_4_2_3P61_RC~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=916b49e4fc6ee4959f18e8321f04efc434f85170;p=thirdparty%2Fntp.git

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

bk: 45146e24kvhXhYxb6rrPG3eF6C3b8w
---

916b49e4fc6ee4959f18e8321f04efc434f85170