]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo:ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Mon, 23 Oct 2006 06:40:00 +0000 (02:40 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 23 Oct 2006 06:40:00 +0000 (02:40 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 453c63c06jKeqP2rS9CG5ko1kQAuUw


Trivial merge