Merge commit 'remotes/meins/master'
authorAndre Noll <maan@systemlinux.org>
Fri, 14 Mar 2008 09:01:47 +0000 (10:01 +0100)
committerAndre Noll <maan@systemlinux.org>
Fri, 14 Mar 2008 09:01:47 +0000 (10:01 +0100)

Trivial merge