From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 26 Jun 2006 06:55:36 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f548e5e142b29bfbd0996578d3999ddbdd1bf2ec;p=thirdparty%2Fntp.git

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

bk: 449f84e8hCERRisBnD5Lh7f0c6EEIw
---

f548e5e142b29bfbd0996578d3999ddbdd1bf2ec