Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1381

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1343-81

bk: 4afe176cz2xcowaalyqcLdtqowY8NQ

diff --cc ChangeLog
index 79b78a545812c4acac93aab07f774c99d97aa500,c7541023e0845eede1b08e2631e92257a38f4486..320d1a3bd244431d470bad005d6b89988d09b339
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,6 +1,7 @@@
 -  known dependecy-breaking changes to force .deps to be cleaned, 
 +* [Bug 1343] sntp illegal C does not compile on Solaris 7.
+ * [Bug 1381] Version .deps generated include file dependencies to allow
++  known dependency-breaking changes to force .deps to be cleaned,
+   triggered by changing the contents of deps-ver and/or sntp/deps-ver.
  (4.2.5p244-RC) 2009/11/12 Released by Harlan Stenn <stenn@ntp.org>
  * keygen.html updates from Dave Mills.
  * [Bug 1003] ntpdc unconfig command doesn't prompt for keyid.

diff --cc configure.ac
Simple merge

diff --cc sntp/configure.ac
Simple merge