]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Thu, 28 Dec 2006 08:23:29 +0000 (03:23 -0500)
committerHarlan Stenn <stenn@ntp.org>
Thu, 28 Dec 2006 08:23:29 +0000 (03:23 -0500)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 45937f01sEI4VMLskDoiUdUdAjkl2g


Trivial merge