]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-os1.ntp.org:/home/karlsson/ntp-dev
authorLinux Karlsson <karlsson@ntp.org>
Thu, 26 Aug 2010 11:39:17 +0000 (04:39 -0700)
committerLinux Karlsson <karlsson@ntp.org>
Thu, 26 Aug 2010 11:39:17 +0000 (04:39 -0700)
into  psp-os1.ntp.org:/home/karlsson/ntp-gsoc-testing

bk: 4c765265DRwKJHoiJ792fNwLDIT-5w


Trivial merge