]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sun, 15 Jan 2006 08:36:01 +0000 (03:36 -0500)
committerHarlan Stenn <stenn@ntp.org>
Sun, 15 Jan 2006 08:36:01 +0000 (03:36 -0500)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-danny

bk: 43ca0971bnLfwe_XuKw3SudVJO6VlQ


Trivial merge