]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Thu, 24 Aug 2006 09:07:32 +0000 (05:07 -0400)
committerHarlan Stenn <stenn@ntp.org>
Thu, 24 Aug 2006 09:07:32 +0000 (05:07 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 44ed6c54GxuipBmuIX2qd3cEIASScw


Trivial merge