]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-dev-614
authorHarlan Stenn <stenn@ntp.org>
Sat, 24 Jun 2006 20:38:58 +0000 (16:38 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 24 Jun 2006 20:38:58 +0000 (16:38 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 449da2e2jCyj57xiOYS-BnI4VZ9Wnw


Trivial merge