From: Martin Mares <mj@ucw.cz>
Date: Fri, 8 Dec 2006 17:09:08 +0000 (+0100)
Subject: Merge with git+ssh://cvs.ucw.cz/projects/sherlock/GIT/sherlock.git#v3.10
X-Git-Tag: holmes-import~507^2~20
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=479e139592180f98c752f88db6c69d9c88258355;p=libucw.git

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

(centrum/cz/{cf/local,config} merged manually)
---

479e139592180f98c752f88db6c69d9c88258355