Merge remote branch 'ch/issue926'
authorMichael Prokop <mika@grml.org>
Wed, 1 Dec 2010 21:39:21 +0000 (22:39 +0100)
committerMichael Prokop <mika@grml.org>
Wed, 1 Dec 2010 21:39:21 +0000 (22:39 +0100)
Signed-off-by: Michael Prokop <mika@grml.org>

Trivial merge