Merge commit 'remotes/meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 14 Jan 2008 09:15:39 +0000 (10:15 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 14 Jan 2008 09:15:39 +0000 (10:15 +0100)

Trivial merge