Merge from Debian
authorJoerg Jaspert <joerg@debian.org>
Sun, 18 May 2008 10:49:46 +0000 (12:49 +0200)
committerJoerg Jaspert <joerg@debian.org>
Sun, 18 May 2008 10:49:46 +0000 (12:49 +0200)

Trivial merge