From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sun, 28 Oct 2007 21:22:28 +0000 (+0100)
Subject: Merge commit 'origin/master' into debian-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=a1687e009279c235d322b8929f9d31dd947b8c14;hp=a1687e009279c235d322b8929f9d31dd947b8c14;p=deb%2Fpackages.git

Merge commit 'origin/master' into debian-master

Conflicts:

	bin/create_index_pages
	config.sh.sed.in
	cron.d/050checkinst
---