Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Fri, 17 Dec 2010 00:56:24 +0000 (01:56 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 17 Dec 2010 00:56:24 +0000 (01:56 +0100)

Trivial merge