Merge commit 'origin/t/tong'
authorMichael Prokop <mika@grml.org>
Wed, 12 Nov 2008 11:11:53 +0000 (12:11 +0100)
committerMichael Prokop <mika@grml.org>
Wed, 12 Nov 2008 11:11:53 +0000 (12:11 +0100)

Trivial merge