]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Thu, 10 Aug 2006 05:17:46 +0000 (01:17 -0400)
committerHarlan Stenn <stenn@ntp.org>
Thu, 10 Aug 2006 05:17:46 +0000 (01:17 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 44dac17acjxoPu_lhkJ4XNVRwjUJzg


Trivial merge