]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo:ntp-dev-2autogen
authorHarlan Stenn <stenn@ntp.org>
Fri, 16 Jun 2006 22:36:59 +0000 (18:36 -0400)
committerHarlan Stenn <stenn@ntp.org>
Fri, 16 Jun 2006 22:36:59 +0000 (18:36 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 4493328bELhha7AMDRRDYF9jeT-jlQ


Trivial merge