Merge commit 'remotes/fml/v0.3' into v0.3
authorAndre Noll <maan@systemlinux.org>
Thu, 11 Oct 2007 16:59:36 +0000 (18:59 +0200)
committerAndre Noll <maan@systemlinux.org>
Thu, 11 Oct 2007 16:59:36 +0000 (18:59 +0200)

Trivial merge