Merge commit 'remotes/meins/v0.3' into v0.3
authorAndre Noll <maan@systemlinux.org>
Tue, 2 Oct 2007 08:20:45 +0000 (10:20 +0200)
committerAndre Noll <maan@systemlinux.org>
Tue, 2 Oct 2007 08:20:45 +0000 (10:20 +0200)

Trivial merge