]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 15 Aug 2006 10:12:57 +0000 (06:12 -0400)
committerHarlan Stenn <stenn@ntp.org>
Tue, 15 Aug 2006 10:12:57 +0000 (06:12 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 44e19e29HRxBasjlwRNXKcNyeNToYA


Trivial merge