Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 16 Mar 2009 21:05:32 +0000 (22:05 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 16 Mar 2009 21:05:32 +0000 (22:05 +0100)

Trivial merge