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

diff --cc lib/Makefile
index 39885a9ff4b8c30052eba804477ab434eb827e20,8555ad271255bb8bfa2b2c078be38a23b66a23bd..e4126c7fefe369257247c7eacb52ed8df108c230
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -9,9 -9,9 +9,9 @@@ endi
  LIBUCW_MODS= \
        alloc alloc_str realloc mempool mempool-str mempool-fmt \
        mmap pagecache partmap hashfunc \
-       lists slists sorter bitsig kmp \
+       lists slists sorter bitsig \
        log log-file proctitle \
 -      conf ipaccess \
 +      conf conf2 ipaccess \
        profile \
        fastbuf ff-printf ff-utf8 \
        fb-file carefulio fb-mem fb-temp fb-mmap fb-limfd fb-buffer fb-grow \