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

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

bk: 52ccacffUpNB3WNnswlm3DoN9Bj_KQ

diff --cc ChangeLog
index 39d987dbf975c0ad2d33dd824ef51a53e8fe67dc,d77fc98eb128470f6be7b9bb481025dbddbb75e7..fe67773e638d7879ef28783e0f9cd4800b620caa
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,7 @@@
 +* [Bug 2332] Force reference to 'libgcc_s' when using GCC, because
 +  threading+restricted user+locked memory otherwise fails on Linux.
+ * Cleanup to the new scripts/*/Makefile.am files.
+ (4.2.7p409) 2014/01/04 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2060] Warn about restrictions with "kod" but not "limited".
  (4.2.7p408) 2013/12/29 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2187] Update version number generation scripts.