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

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

bk: 50ac38edBR3czYwtMqdNRy3ho9lh2w

diff --cc ChangeLog
index 59a487ad5e02597dc48943c640e16845b0260d6c,0474703516764ba8fc3b595bf4976272dbbaad26..3ff9b8efa23c8d3b75edab70763a505951246c28
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,5 +1,7 @@@
- * [Bug 2202] ntpq.html: there is no "acv" billboard.
 +* [Bug 1214] 'proto: precision = ...' should be at INFO, not NOTICE.
 +* [Bug 2246] Clear sys_leap when voting says to disarm the leap.
+ (4.2.7p325) 2012/11/20 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 2202] ntpq.html: there is no "acv" billboard.
  * [Bug 2306] keep pps hack for Win32 even if user-mode/loopback
    PPS API is activated on a serial line.
  (4.2.7p324) 2012/11/19 Released by Harlan Stenn <stenn@ntp.org>