Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Fri, 26 Mar 2010 16:24:37 +0000 (17:24 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 26 Mar 2010 16:24:37 +0000 (17:24 +0100)

Trivial merge