Merge branch 'debian' of git://live.debian.net/git/live-boot into debian
authorChristian Hofstaedtler <ch@grml.org>
Tue, 19 Apr 2011 17:14:54 +0000 (19:14 +0200)
committerChristian Hofstaedtler <ch@grml.org>
Tue, 19 Apr 2011 17:14:54 +0000 (19:14 +0200)

Trivial merge