Merge branch 'patch-1' of https://github.com/bionix/grml.org into pull-request-1
authorMichael Prokop <mika@grml.org>
Wed, 16 May 2012 23:16:43 +0000 (01:16 +0200)
committerMichael Prokop <mika@grml.org>
Wed, 16 May 2012 23:16:43 +0000 (01:16 +0200)

Trivial merge