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

bk: 44e402efaz2Zblz7_RkFs1VLsDktJg


Trivial merge