Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Thu, 14 Jul 2011 21:04:51 +0000 (23:04 +0200)
committergregor herrmann <gregoa@debian.org>
Thu, 14 Jul 2011 21:04:51 +0000 (23:04 +0200)

Trivial merge