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

bk: 44ef45951SdvbMWu-M9gyAuL4qsZew


Trivial merge