Merge branch 'master' of git.grml.org:grml-infrastructure
authorChristian Hofstaedtler <ch@grml.org>
Sun, 29 May 2011 12:30:09 +0000 (14:30 +0200)
committerChristian Hofstaedtler <ch@grml.org>
Sun, 29 May 2011 12:30:09 +0000 (14:30 +0200)

Trivial merge