]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://ntp.bkbits.net/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Mon, 19 Jun 2006 00:17:16 +0000 (20:17 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 19 Jun 2006 00:17:16 +0000 (20:17 -0400)
into  pogo.udel.edu:/pogo/users/kardel/main-line/ntp-dev

bk: 4495ed0cpUZx0IQlchRYvROOd7YxXA


Trivial merge