Merge branch 'master' of ssh://git@git.grml.org/grml2usb
authorMichael Prokop <mika@grml.org>
Sat, 24 Oct 2009 12:27:07 +0000 (14:27 +0200)
committerMichael Prokop <mika@grml.org>
Sat, 24 Oct 2009 12:27:07 +0000 (14:27 +0200)

Trivial merge