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

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

bk: 51d617e6s5seF9ogQFSno_AVXaBAlw

diff --cc ChangeLog
index 8a13b17651d28c02d8974afff2ebe6e5838835b1,670046e9f8f9bdb171e97f15850dcd2ad6fe0d19..866eca0bd9b5ed24ddbedd54e048e7d7099c0548
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,4 +1,11 @@@
+ * Fix ntpsweep to use sntp instead of ntpdate, from Oliver Kindernay.
 +(4.2.7p368) 2013/05/01 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2145] ntpq dumps core when displaying sys_var_list and more.
 +(4.2.7p367) 2013/04/25 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1485] Sometimes ntpd crashes
 +* [Bug 2382] Implement LOGTOD using ldexp() instead of shifting.
 +(4.2.7p366) 2013/04/17 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1866] Disable some debugging output in refclock_oncore.
  (4.2.7p365) 2013/04/16 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2149] Log an error message if /proc/net/if_inet6 cannot be opened.
  (4.2.7p364) 2013/03/26 Released by Harlan Stenn <stenn@ntp.org>