]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo:/usa/kardel/main-line/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Fri, 8 Sep 2006 21:39:37 +0000 (17:39 -0400)
committerHarlan Stenn <stenn@ntp.org>
Fri, 8 Sep 2006 21:39:37 +0000 (17:39 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 4501e3199qaG9NIYZDU2h-qGSeMK3w


Trivial merge