Merge remote branch 'grml-scripts/master'
authorUlrich Dangel <mru@grml.org>
Mon, 18 Apr 2011 20:47:20 +0000 (22:47 +0200)
committerUlrich Dangel <mru@grml.org>
Mon, 18 Apr 2011 20:47:20 +0000 (22:47 +0200)

Trivial merge