Merge bk://maccarony/ntp-stable

into  pogo.udel.edu:/pogo/users/hart/ntp-stable-1478-79-84

bk: 4b7117cfT7Ro1M0g8zke7Oby4A7Nlg

diff --cc ChangeLog
index 099e24a16d8b674be75878d5d5fda54f61f0b34a,2c1a58f79ea9cd4e34dedb8c739950a1cd6d0210..e9ff50aaf56d3482a199f4584204f94d12729951
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,8 +1,11 @@@
  ---
  
+ * [Bug 1140] Clean up debug.html, decode.html, and ntpq.html.
  * [Bug 1477] 1st non-gmake make in clone w/VPATH can't make COPYRIGHT.
 +* [Bug 1478] linking fails with undefined reference EVP_MD_pkey_type.
 +* [Bug 1479] Compilation fails because of not finding readline headers.
  * [Bug 1480] snprintf() cleanup caused unterminated refclock IDs.
 +* [Bug 1484] ushort is not defined in QNX6.
  
  ---
  (4.2.6p1-RC4) 2010/02/04 Released by Harlan Stenn <stenn@ntp.org>