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

Merge branch 'upstream'
---

a385a0e0d0e870bf58cab9bb31e73ca2410bdec7