]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 26 Jun 2006 00:46:46 +0000 (20:46 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 26 Jun 2006 00:46:46 +0000 (20:46 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-stable

bk: 449f2e76tN7afH_rzr8gjgKTNccqlw


Trivial merge