]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Tue, 29 Aug 2006 09:09:51 +0000 (05:09 -0400)
committerHarlan Stenn <stenn@ntp.org>
Tue, 29 Aug 2006 09:09:51 +0000 (05:09 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 44f4045fweHAY6sjU1ivotcJkX3sIg


Trivial merge