Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Tue, 16 Mar 2010 22:19:52 +0000 (23:19 +0100)
committergregor herrmann <gregoa@debian.org>
Tue, 16 Mar 2010 22:19:52 +0000 (23:19 +0100)

Trivial merge