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

bk: 4529932eT_MbHnSkXv5cn_AZowDEMQ


Trivial merge