Merge

bk: 3f1bc627Je-dodniZJIWEkA7lMcdaw

diff --cc configure.in
index 9303860343ddf8a048964a36bf532172f0104761,d569fcbd26f5e62e53aec91b6a46cae85d66bd63..64500caeb9cf86802351a1575b9862382c25adfe
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -5,7 -5,7 +5,7 @@@ AC_CANONICAL_SYSTE
  AC_DEFINE_UNQUOTED(STR_SYSTEM, "$host", [canonical system (cpu-vendor-os) string])
  AM_CONFIG_HEADER(config.h)
  AC_ARG_PROGRAM
- AM_INIT_AUTOMAKE(ntp, 4.1.80-rc1)
 -AM_INIT_AUTOMAKE(ntp, 4.1.2a)
++AM_INIT_AUTOMAKE(ntp, 4.1.80-rc1a)
  AC_PREREQ(2.53)
  
  ac_cv_var_atom_ok=no