Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Wed, 4 Jun 2008 19:08:22 +0000 (21:08 +0200)
committerAndre Noll <maan@systemlinux.org>
Wed, 4 Jun 2008 19:08:22 +0000 (21:08 +0200)

Trivial merge