From: Linux Karlsson Date: Mon, 19 Jul 2010 08:55:36 +0000 (-0400) Subject: Merge psp-deb1.ntp.org:/home/karlsson/ntp-dev X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=efafb5d8fb6f15b5f296e79e29c0821481f49c19;p=thirdparty%2Fntp.git Merge psp-deb1.ntp.org:/home/karlsson/ntp-dev into psp-deb1.ntp.org:/home/karlsson/ntp-gsoc-testing bk: 4c441308A7Dxi4XWtaP8NDrjGZ-zKA --- efafb5d8fb6f15b5f296e79e29c0821481f49c19