Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Fri, 30 May 2008 20:56:50 +0000 (22:56 +0200)
committerAndre Noll <maan@systemlinux.org>
Fri, 30 May 2008 20:56:50 +0000 (22:56 +0200)

Trivial merge