]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 20 Jun 2006 07:58:49 +0000 (03:58 -0400)
committerHarlan Stenn <stenn@ntp.org>
Tue, 20 Jun 2006 07:58:49 +0000 (03:58 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 4497aab9A8g2XyKrbH6yCQ_vkx9NbQ


Trivial merge