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

Trivial merge