From: Gerfried Fuchs <rhonda@debian.at>
Date: Wed, 17 Feb 2010 19:51:41 +0000 (+0100)
Subject: Merge branch 'upstream'
X-Git-Tag: debian/2.4-1~1
X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=42c403b15ef2b758888431308c61b467310d9f16;p=pkg%2Ft-prot.git

Merge branch 'upstream'
---

42c403b15ef2b758888431308c61b467310d9f16