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

Merge branch 'upstream'
---

dd48847918e60ea25b6c27603ca0f7f8c68f92ec