From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 5 Feb 2007 04:13:50 +0000 (-0500)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_5P6~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32ea4ed66920477502260ede6fc12be6d9b357c5;p=thirdparty%2Fntp.git

Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 45c6aefeRwzfO38DFRmjmNRdoedmyg
---

32ea4ed66920477502260ede6fc12be6d9b357c5