Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Fri, 13 Mar 2009 08:24:21 +0000 (09:24 +0100)
committerAndre Noll <maan@systemlinux.org>
Fri, 13 Mar 2009 08:24:21 +0000 (09:24 +0100)

Trivial merge