Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Sat, 8 Oct 2011 01:36:39 +0000 (03:36 +0200)
committergregor herrmann <gregoa@debian.org>
Sat, 8 Oct 2011 01:36:39 +0000 (03:36 +0200)

Trivial merge