Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 16 Feb 2009 22:38:16 +0000 (23:38 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 16 Feb 2009 22:38:16 +0000 (23:38 +0100)

Trivial merge