Merge branch 'master' into gregoa
authorgregor herrmann <gregoa@debian.org>
Sun, 28 Mar 2010 13:51:53 +0000 (15:51 +0200)
committergregor herrmann <gregoa@debian.org>
Sun, 28 Mar 2010 13:51:53 +0000 (15:51 +0200)

Trivial merge