]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo:/usa/mayer/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Mon, 25 Jul 2005 22:09:52 +0000 (18:09 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 25 Jul 2005 22:09:52 +0000 (18:09 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 42e56330_D-FHgz8gMgspWRABN7qPg


Trivial merge