]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sat, 14 Jan 2006 23:29:56 +0000 (18:29 -0500)
committerHarlan Stenn <stenn@ntp.org>
Sat, 14 Jan 2006 23:29:56 +0000 (18:29 -0500)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag

bk: 43c98974q-Jwju6Z-QU3gjRBYS24tA


Trivial merge