]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Tue, 6 Jun 2006 04:13:25 +0000 (00:13 -0400)
committerHarlan Stenn <stenn@ntp.org>
Tue, 6 Jun 2006 04:13:25 +0000 (00:13 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag

bk: 448500e57SOLpruFltDFhU1xXWcQjw


Trivial merge