]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Wed, 30 Aug 2006 19:08:54 +0000 (15:08 -0400)
committerHarlan Stenn <stenn@ntp.org>
Wed, 30 Aug 2006 19:08:54 +0000 (15:08 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 44f5e246u5fiBgaqy9SRqh1VkPureA


Trivial merge