Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Wed, 25 Jun 2008 16:39:37 +0000 (18:39 +0200)
committerAndre Noll <maan@systemlinux.org>
Wed, 25 Jun 2008 16:39:37 +0000 (18:39 +0200)

Trivial merge