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

into  psp-deb1.ntp.org:/home/stenn/ntp-dev-2256

bk: 525f8eadiboINj5YGJ-AZ1v9jVk8Gg

diff --cc ChangeLog
index d938f186057e1d15fa020d767c618ec1ad0318df,88b11e97d948ef68242aaab103c3860bf4061207..5949d8c29738dd251bd25ea0b823810674fb7271
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,8 +1,9 @@@
 +* [Bug 2256] Improve configure's function searches in libraries.
+ (4.2.7p393) 2013/10/16 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 2272] Use C99 integer types. ntp_calendar.h and ntp_types.h .
+ (4.2.7p392) 2013/10/15 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 2375] Improve AIX compatibility.
+ * [Bug 2490] Fixed non-const initializer coming from [Bug 2250] fix.
  (4.2.7p391) 2013/10/12 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2250] Rework of leap second handling machine.
  * [Bug 2419] [rc-nmea] Improve clockstats reporting when receiver sends

diff --cc configure.ac
Simple merge

diff --cc sntp/m4/ntp_libntp.m4
Simple merge