]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Tue, 12 Apr 2011 07:57:19 +0000 (07:57 +0000)
committerHarlan Stenn <stenn@ntp.org>
Tue, 12 Apr 2011 07:57:19 +0000 (07:57 +0000)
into  psp-fb2.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev

bk: 4da405dfAPVLEARQt_JdUkuU7g1-7g


Trivial merge