Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Wed, 12 Jan 2011 23:11:47 +0000 (00:11 +0100)
committergregor herrmann <gregoa@debian.org>
Wed, 12 Jan 2011 23:11:47 +0000 (00:11 +0100)

Trivial merge