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

Merge branch 'upstream'
---

5b1159f3c4685975d79baabe9d149763ff8188bd