Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Wed, 11 Feb 2009 22:51:44 +0000 (23:51 +0100)
committerAndre Noll <maan@systemlinux.org>
Wed, 11 Feb 2009 22:51:44 +0000 (23:51 +0100)

Trivial merge