Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Sun, 12 Oct 2008 22:58:10 +0000 (00:58 +0200)
committerAndre Noll <maan@systemlinux.org>
Sun, 12 Oct 2008 22:58:10 +0000 (00:58 +0200)

Trivial merge