]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 27 Jun 2006 22:32:20 +0000 (18:32 -0400)
committerHarlan Stenn <stenn@ntp.org>
Tue, 27 Jun 2006 22:32:20 +0000 (18:32 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 44a1b1f4D0REagwsR1Brb_VJXgfjBQ


Trivial merge