Merge branch 'master' of ssh://git.grml.org/grml-live
authorMichael Prokop <mika@grml.org>
Fri, 1 Oct 2010 13:48:49 +0000 (15:48 +0200)
committerMichael Prokop <mika@grml.org>
Fri, 1 Oct 2010 13:48:49 +0000 (15:48 +0200)

Trivial merge