Merge branch 'debian'
authorChristian Hofstaedtler <ch@grml.org>
Tue, 6 Dec 2011 21:22:25 +0000 (22:22 +0100)
committerChristian Hofstaedtler <ch@grml.org>
Tue, 6 Dec 2011 21:22:25 +0000 (22:22 +0100)

Trivial merge