]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/karlsson/bugs/ntp-dev-1595
authorLinux Karlsson <karlsson@ntp.org>
Wed, 28 Jul 2010 18:14:56 +0000 (14:14 -0400)
committerLinux Karlsson <karlsson@ntp.org>
Wed, 28 Jul 2010 18:14:56 +0000 (14:14 -0400)
into  psp-deb1.ntp.org:/home/karlsson/ntp-gsoc-testing

bk: 4c5073a0-rRep18sj1q8xPkaEUdjeg


Trivial merge