From: Martin Mares <mj@ucw.cz>
Date: Sun, 16 Nov 2008 19:36:39 +0000 (+0100)
Subject: Merge branch 'master' into dev-lib
X-Git-Tag: holmes-import~150
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=a4fe009d3366b0a3e119713b0ecc7fc0070efdfa;p=libucw.git

Merge branch 'master' into dev-lib

Conflicts:

	lib/autoconf.cfg

Will solve manually in a moment.
---

a4fe009d3366b0a3e119713b0ecc7fc0070efdfa