Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Fri, 18 Mar 2011 11:17:50 +0000 (12:17 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 18 Mar 2011 11:17:50 +0000 (12:17 +0100)

Trivial merge