Merge from Debian
authorJoerg Jaspert <joerg@debian.org>
Wed, 14 May 2008 23:02:17 +0000 (01:02 +0200)
committerJoerg Jaspert <joerg@debian.org>
Wed, 14 May 2008 23:02:17 +0000 (01:02 +0200)

Trivial merge