From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Mon, 3 Mar 2008 14:08:01 +0000 (+0100)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=f6d66b5daf7bd24e43a9e0a91ad5ece09d3d4519;p=deb%2Fpackages.git

Merge branch 'master' into ubuntu-master

Conflicts:

	config.sh.sed.in
---

f6d66b5daf7bd24e43a9e0a91ad5ece09d3d4519