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

Trivial merge