Merge bk://bk.ntp.org/ntp-dev

into  psp-deb1.ntp.org:/home/perlinger/ntp-dev-2570

bk: 5343ac7bz2KWQauLustvFjSgxvjqtg

diff --cc ChangeLog
index 2ed91c998652dc5d8226acb624b0f88f1a3f86db,5bb13ae9f369cd8a902934cec3e05a1384282613..e8f24713481c0eb077cc5d12f7af550d33d2a3f7
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,5 +1,6 @@@
+ * [Bug 2536] ntpd sandboxing support (libseccomp2) cleanup.
 +* [Bug 2570] cleanup: fix log format for successful leapfile load
+ (4.2.7p439) 2014/04/03 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2589] fix VS2009 compile problem.
  (4.2.7p438) 2014/04/01 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2546] Windows build documentation updates.