]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo:/usa/kardel/main-line/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sun, 8 Oct 2006 07:38:23 +0000 (03:38 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sun, 8 Oct 2006 07:38:23 +0000 (03:38 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 4528aaef36kYIY4APa96nOLYnTELDw


Trivial merge