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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-rm-arlib

bk: 4b6a4e60tn1wKLiawG-jZoDh7vHC9A

diff --cc ChangeLog
index c17c4f5477d85bac6b2fecc9ac29f8130949e793,c5481bcd9c838521c260fbff4be8449545abce49..470ba9f2fc6eec0bd2c435a5e6345483d6842268
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,4 +1,5 @@@
- * Include (4.2.6p1) - [Bug 1474] ntp_keygen LCRYPTO after libntp.a.
- * Include (4.2.6p1) - Remove arlib.
 -* Include (4.2.6p1-RC4) - [Bug 1474] ntp_keygen needs LCRYPTO after libntp.a.
++* Include (4.2.6p1-RC4) - [Bug 1474] ntp_keygen LCRYPTO after libntp.a.
++* Include (4.2.6p1-RC4) - Remove arlib.
  (4.2.7p15) 2010/02/03 Released by Harlan Stenn <stenn@ntp.org>
  * Include (4.2.6p1) - [Bug 1455] ntpd does not try /etc/ntp.audio.
  * Include (4.2.6p1) - Convert many sprintf() calls to snprintf(), also