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

Trivial merge