Merge commit 'remotes/meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 17 Mar 2008 08:43:33 +0000 (09:43 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 17 Mar 2008 08:43:33 +0000 (09:43 +0100)

Trivial merge