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

Hand-merged:

  debug/Makefile
  lib/Makefile
  gather/shepherd/shep-select.c

diff --cc lib/Makefile
index 37a1e7fc9417daf3719117e5a0a96d1162659b7e,025d088b8b76646d46f564efa366ed2d3155b609..814ec251f821949b54f03925aea0fe3f2ce40fb2
--- 1/lib/Makefile
--- 2/lib/Makefile
+++ b/lib/Makefile
@@@ -1,7 -1,7 +1,7 @@@
 -# Makefile for the UCW Library (c) 1997--2006 Martin Mares <mj@ucw.cz>
 +# Makefile for the UCW Library (c) 1997--2007 Martin Mares <mj@ucw.cz>
  
  DIRS+=lib
- LIBUCW=$(o)/lib/libucw.$(LS)
+ CONFIGS+=library
  
  ifdef CONFIG_UCW_DBTOOL
  PROGS+=$(o)/lib/db-tool