Merge

bk: 3ebf5455IcYVeQsLf7pgJuWi1nVP3Q

diff --cc ntpd/refclock_neoclock4x.c
index 2fea9dc6d99baeff60803daff9d13e0ed7049987,cd8ba0c73a9da33dbcf014bc7a6640934e0caa79..2156fc3497ac0ddcd5fce0103a712adb97d9be0f
--- 1/ntpd/refclock_neoclock4x.c
--- 2/ntpd/refclock_neoclock4x.c
+++ b/ntpd/refclock_neoclock4x.c
@@@ -933,8 -933,10 +933,11 @@@ neol_query_firmware(int fd
              init = 0;
              continue;
            }
-         
-         /*msyslog(LOG_NOTICE, "NeoClock4X(%d): firmware %c = %02Xh", unit, c, c); */
+ 
+ #if 0
+         msyslog(LOG_NOTICE, "NeoClock4X(%d): firmware %c = %02Xh", unit, c, c);
+ #endif
++
          if(0x0A == c || 0x0D == c)
            {
              if(last_c_was_crlf)