]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Mon, 7 Aug 2006 22:45:00 +0000 (18:45 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 7 Aug 2006 22:45:00 +0000 (18:45 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 44d7c26cLX76U9RgJvHGayYvBFjPPA


Trivial merge