Merge branch 'master' of ssh://git@git.grml.org/grml-scripts
authorMichael Prokop <mika@grml.org>
Mon, 18 May 2009 06:16:55 +0000 (08:16 +0200)
committerMichael Prokop <mika@grml.org>
Mon, 18 May 2009 06:16:55 +0000 (08:16 +0200)

Trivial merge