Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Sat, 18 Oct 2008 18:50:06 +0000 (20:50 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 18 Oct 2008 18:50:06 +0000 (20:50 +0200)

Trivial merge