Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 10 Nov 2008 21:32:24 +0000 (22:32 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 10 Nov 2008 21:32:24 +0000 (22:32 +0100)

Trivial merge