]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo:/usa/kardel/main-line/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 24 Jun 2006 20:54:17 +0000 (16:54 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 24 Jun 2006 20:54:17 +0000 (16:54 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-stable-614

bk: 449da679KvWVcorEGrFjav5M0ovY0A


Trivial merge