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

bk: 452dcdb5_PvTCT9qWz7M1X1Q5s7iwQ


Trivial merge