Merge remote-tracking branch 'debian/debian' into debian
authorUlrich Dangel <mru@grml.org>
Wed, 20 Jul 2011 01:53:59 +0000 (03:53 +0200)
committerUlrich Dangel <mru@grml.org>
Wed, 20 Jul 2011 01:53:59 +0000 (03:53 +0200)

Trivial merge