Merge remote-tracking branch 'deb/debian' into debian
authorChristian Hofstaedtler <ch@grml.org>
Tue, 6 Dec 2011 20:33:53 +0000 (21:33 +0100)
committerChristian Hofstaedtler <ch@grml.org>
Tue, 6 Dec 2011 20:33:53 +0000 (21:33 +0100)

Trivial merge