From: Gerfried Fuchs <rhonda@debian.org>
Date: Mon, 31 Oct 2011 14:15:57 +0000 (+0100)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/w?p=deb%2Fpackages.git;a=commitdiff_plain;h=refs%2Fheads%2Fubuntu-master

Merge branch 'master' into ubuntu-master
---

697a779bad0766a27b20690a4f0b05c1dc30ea8c