From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 22 Jun 2006 20:18:54 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable-632
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be1d50a110df11f29f2d9429186bf702d74abc7c;p=thirdparty%2Fntp.git

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

bk: 449afb2e5Q7k9YQwsMicl3UavXzwFA
---

be1d50a110df11f29f2d9429186bf702d74abc7c