]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge kuehn@pogo.udel.edu:ntp-dev-dlo-new
authorJohannes Maximilian Kuehn <kuehn@ntp.org>
Wed, 12 Aug 2009 08:10:37 +0000 (17:10 +0900)
committerJohannes Maximilian Kuehn <kuehn@ntp.org>
Wed, 12 Aug 2009 08:10:37 +0000 (17:10 +0900)
into  yumi.mxiesoft.com:/geom_mobile/home/Amidamaru/ntp-dev-dlo/ntp-dev-dlo

bk: 4a8278fdNSIa493oxjGT43jpDiTgeg


Trivial merge