Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Fri, 26 Mar 2010 14:22:23 +0000 (15:22 +0100)
committergregor herrmann <gregoa@debian.org>
Fri, 26 Mar 2010 14:22:23 +0000 (15:22 +0100)

Trivial merge