Merge remote-tracking branch 'live-boot-debian/debian' into debian
authorMichael Prokop <mika@grml.org>
Wed, 9 May 2012 12:16:42 +0000 (14:16 +0200)
committerMichael Prokop <mika@grml.org>
Wed, 9 May 2012 12:16:42 +0000 (14:16 +0200)

Trivial merge