Merge resolution.

bk: 3ca55f29F_HaWn5W-EVNbN1F9SrIdw

diff --cc configure.in
Simple merge

diff --cc include/ntp.h
Simple merge

diff --cc libntp/Makefile.am
index a03d075cd43fa155888599d931614e0d52e9d865,ab303567c3733b9d9ee70376e0a82383b8108936..e55d57cb452371ed1c82aeba26724cbbd11d594b
--- 1/libntp/Makefile.am
--- 2/libntp/Makefile.am
+++ b/libntp/Makefile.am
@@@ -8,9 -8,9 +8,10 @@@ libntp_a_SOURCES = a_md5encrypt.c adjti
        findconfig.c fptoa.c fptoms.c getopt.c gpstolfp.c hextoint.c \
        hextolfp.c humandate.c icom.c ieee754io.c inttoa.c iosignal.c \
        lib_strbuf.c machines.c md5c.c memmove.c mfp_mul.c mfptoa.c \
-       mfptoms.c modetoa.c mstolfp.c msutotsf.c msyslog.c netof.c \
+       mfptoms.c mktime.c modetoa.c mstolfp.c msutotsf.c msyslog.c netof.c \
 -      numtoa.c numtohost.c octtoint.c prettydate.c ranny.c recvbuff.c \
 -      refnumtoa.c snprintf.c statestr.c strdup.c strerror.c strstr.c\
 +      ntp_rfc2553.c numtoa.c numtohost.c octtoint.c prettydate.c \
-       ranny.c recvbuff.c refnumtoa.c socktoa.c socktohost.c statestr.c \
++      ranny.c recvbuff.c refnumtoa.c snprintf.c socktoa.c socktohost.c \
++      statestr.c strdup.c strerror.c strstr.c \
        syssignal.c systime.c tsftomsu.c tstotv.c tvtoa.c tvtots.c \
        uglydate.c uinttoa.c utvtoa.c ymd2yd.c
  EXTRA_libntp_a_SOURCES = adjtimex.c log.c random.c

diff --cc ntpd/ntp_config.c
Simple merge

diff --cc ntpd/ntp_control.c
Simple merge

diff --cc ntpd/ntp_crypto.c
Simple merge

diff --cc ntpd/ntp_peer.c
Simple merge

diff --cc ntpd/ntp_proto.c
Simple merge