]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sun, 20 Aug 2006 06:37:04 +0000 (02:37 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sun, 20 Aug 2006 06:37:04 +0000 (02:37 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 44e80310Kxxkr_i16XZlm_OLZSYVGQ


Trivial merge