Merge branch 'master' into gregoa gregoa
authorgregor herrmann <gregoa@debian.org>
Sun, 11 Dec 2011 14:09:52 +0000 (15:09 +0100)
committergregor herrmann <gregoa@debian.org>
Sun, 11 Dec 2011 14:09:52 +0000 (15:09 +0100)

Trivial merge