Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Sat, 8 Oct 2011 19:31:25 +0000 (21:31 +0200)
committergregor herrmann <gregoa@debian.org>
Sat, 8 Oct 2011 19:31:25 +0000 (21:31 +0200)

Trivial merge