Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Thu, 2 Jun 2011 14:10:59 +0000 (16:10 +0200)
committergregor herrmann <gregoa@debian.org>
Thu, 2 Jun 2011 14:10:59 +0000 (16:10 +0200)

Trivial merge