Merge branch 'master' into dev-opt

Conflicts:
	ucw/Makefile

diff --cc ucw/Makefile
index ece9b9a8add0f2c2eba4af3b7ace1cbd320075d6,f1c171a58bcd075f0e37ba98805543dff0bdcfd7..373a8f7f11878ba66d8c72e2784ea071e4ba7957
--- 1/ucw/Makefile
--- 2/ucw/Makefile
+++ b/ucw/Makefile
@@@ -65,7 -64,7 +65,8 @@@ LIBUCW_MAIN_INCLUDES= 
        resource.h trans.h \
        daemon.h \
        signames.h \
 -      sighandler.h
++      sighandler.h \
 +      opt.h
  
  ifdef CONFIG_UCW_THREADS
  # Some modules require threading
@@@ -122,7 -136,7 +139,7 @@@ TESTS+=$(addprefix $(o)/ucw/,regex.tes
      fb-socket.test trie-test.test string.test sha1.test asort-test.test binheap-test.test \
      redblack-test.test fb-file.test fb-grow.test fb-pool.test fb-atomic.test \
      fb-limfd.test fb-temp.test fb-mem.test fb-buffer.test fb-mmap.test fb-multi.test url.test strtonum-test.test \
-     gary.test time.test crc.test signames.test md5.test opt.test)
 -    gary.test time.test crc.test signames.test md5.test bitops.test)
++    gary.test time.test crc.test signames.test md5.test bitops.test opt.test)
  
  $(o)/ucw/varint.test: $(o)/ucw/varint-t
  $(o)/ucw/regex.test: $(o)/ucw/regex-t

diff --cc ucw/conf-internal.h
Simple merge