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

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

bk: 4aa375bcq3UowYpbn564ml7xyt9rbg

diff --cc ChangeLog
index 825c8a318cfbfcfb8ecf9edaf99e5a9586aeca0d,cd94f4395b685fda6c979f5d02fd31d37bddc453..37969dac7e84871b4280a41c839ba09bb59c384f
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,7 @@@
 +* [Bug 1294] Use OPENSSL_INC and OPENSSL_LIB macros for Windows
 +  and remove unnecessary reference to applink.c for Windows
+ * [Bug 1295] trap directive options are not optional.
+ * [Bug 1297] yylex() must always set yylval before returning.
  (4.2.5p209) 2009/09/01 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1290] Fix to use GETTIMEOFDAY macro
  * [Bug 1289] Update project files for VC6, VS2003, VS2005, VS 2008