Merge from -common branch
authorJoerg Jaspert <joerg@debian.org>
Fri, 16 May 2008 18:56:53 +0000 (20:56 +0200)
committerJoerg Jaspert <joerg@debian.org>
Fri, 16 May 2008 18:56:53 +0000 (20:56 +0200)

Trivial merge