Branche merge
authorMichael Prokop <mika@grml.org>
Fri, 22 Jun 2007 22:05:37 +0000 (00:05 +0200)
committerMichael Prokop <mika@grml.org>
Fri, 22 Jun 2007 22:05:37 +0000 (00:05 +0200)

Trivial merge