Merge psp-fb1.ntp.org:/home/stenn/ntp-dev

into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-libevent

bk: 4d393203OLiCVvAQUknKPO2Amn5NRw

diff --cc ChangeLog
index 407bd1f13e51db63633108eec303ae98236aea14,7d8dfd1e08930f85b497dd24807912f611067a21..cb703a826c3a4abb3d698eb1f51d96b25897d830
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,9 +1,10 @@@
 +* Import libevent.
+ * [Bug 1786] Remove extra semicolon from ntp_proto.c .
+ (4.2.7p120) 2011/01/20 Released by Harlan Stenn <stenn@ntp.org>
+ * Change new timeval and timespec to string routines to use snprintf()
+   rather than hand-crafted conversion, avoid signed int overflow there.
+ * Add configure support for SIZEOF_LONG_LONG to enable portable use of
+   snprintf() with time_t.
  * Grow ntpd/work_thread.c arrays as needed.
  * Add DEBUG_* variants of ntp_assert.h macros which compile away using
    ./configure --disable-debugging.

diff --cc configure.ac
Simple merge

diff --cc sntp/configure.ac
Simple merge

diff --cc sntp/m4/ntp_libntp.m4
Simple merge

diff --cc sntp/sntp.html
index 6321a104ddd810f5523be85739895b668d16a202,78921638288f6d9381f1264c4022cecce534eca3..0094e7610877d0e8ae096cf4db20af6e133f8e19
--- 1/sntp/sntp.html
--- 2/sntp/sntp.html
+++ b/sntp/sntp.html
@@@ -152,14 -139,9 +152,14 @@@ Up:&nbsp;<a rel="up" accesskey="u" href
  <p><a name="index-sntp-usage-3"></a>
  This is the automatically generated usage text for sntp:
  
- <pre class="example">sntp - standard SNTP program - Ver. 4.2.7p119
+ <pre class="example">sntp - standard SNTP program - Ver. 4.2.7p120
 -USAGE:  sntp [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... hostname-or-IP ...
 +USAGE:  sntp [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... \
 +                [ hostname-or-IP ...]
    Flg Arg Option-Name    Description
 +   -d no  debug-level    Increase output debug message level
 +                                - may appear multiple times
 +   -D Str set-debug-level Set the output debug message level
 +                                - may appear multiple times
     -4 no  ipv4           Force IPv4 DNS name resolution
                                  - prohibits these options:
                                  ipv6