Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Thu, 5 Jun 2008 20:29:59 +0000 (22:29 +0200)
committerAndre Noll <maan@systemlinux.org>
Thu, 5 Jun 2008 20:29:59 +0000 (22:29 +0200)

Trivial merge