Merge branches
authorMichael Prokop <mika@grml.org>
Fri, 18 May 2007 12:31:38 +0000 (14:31 +0200)
committerMichael Prokop <mika@grml.org>
Fri, 18 May 2007 12:31:38 +0000 (14:31 +0200)

Trivial merge