From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 24 Jun 2006 20:38:58 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-dev-614
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f760fbb87f378bf947b327fdc7d3d3de4072504;p=thirdparty%2Fntp.git

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

bk: 449da2e2jCyj57xiOYS-BnI4VZ9Wnw
---

4f760fbb87f378bf947b327fdc7d3d3de4072504