]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo:/usa/mayer/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Fri, 17 Mar 2006 09:33:11 +0000 (04:33 -0500)
committerHarlan Stenn <stenn@ntp.org>
Fri, 17 Mar 2006 09:33:11 +0000 (04:33 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 441a82578ZQKsiYeCGnOWmeyd4W_gw


Trivial merge