Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git

diff --cc lib/Makefile
index 73ec5d3a238bf5272c839b46bcbc699d873f6bca,8cc43c1434b9f7ca9cd05245b8db0c3a5101a635..356391e5a9d3e832cbb2ccd01a1110a1908055d1
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -61,8 -63,8 +64,8 @@@ LIBUCW_INCLUDES= 
  ifdef CONFIG_UCW_THREADS
  # Some modules require threading
  LIBS+=-lpthread
 -LIBUCW_MODS+=threads-conf workqueue
 -LIBUCW_INCLUDES+=workqueue.h semaphore.h
 +LIBUCW_MODS+=threads-conf workqueue asio fb-direct
- LIBUCW_INCLUDES+=workqueue.h asio.h
++LIBUCW_INCLUDES+=workqueue.h semaphore.h asio.h
  endif
  
  ifdef CONFIG_OWN_REGEX