Merge branch 'master' of ssh://git.grml.org/grml-live
authorMichael Prokop <mika@grml.org>
Wed, 4 Aug 2010 03:29:36 +0000 (23:29 -0400)
committerMichael Prokop <mika@grml.org>
Wed, 4 Aug 2010 03:29:36 +0000 (23:29 -0400)

Trivial merge