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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1531-32

bk: 4bd06c29nmkQXZLEglWgc_g8KWjg_A

diff --cc ChangeLog
index 4a41be28c1076408bf3aa83ffa4b069cec2533ed,d769c8c745e4c601b06d67ae1646822ac5c35052..bb349bd19c5285e03191a933de11cb5aec116be1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,6 +1,8 @@@
+ * [Bug 1531] Require nonce with mrulist requests.
+ * [Bug 1532] Remove ntpd support for ntpdc's monlist in favor of ntpq's
+   mrulist.
 +(4.2.7p25) 2010/04/20 Released by Harlan Stenn <stenn@ntp.org>
 +* Include (4.2.6p2-RC2) [Bug 1528], Remove --with-arlib from br-flock.
  * Include (4.2.6p2-RC1) - [Bug 1503] [Bug 1504] [Bug 1518] [Bug 1522],
    all of which were fixed in 4.2.7 previously. 
  (4.2.7p24) 2010/04/13 Released by Harlan Stenn <stenn@ntp.org>