Merge commit 'debian/3.0_a17-1' into debian
authorUlrich Dangel <mru@grml.org>
Thu, 2 Jun 2011 18:55:10 +0000 (20:55 +0200)
committerUlrich Dangel <mru@grml.org>
Thu, 2 Jun 2011 18:55:10 +0000 (20:55 +0200)

Trivial merge