Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Thu, 23 Apr 2009 21:26:23 +0000 (23:26 +0200)
committerAndre Noll <maan@systemlinux.org>
Thu, 23 Apr 2009 21:26:23 +0000 (23:26 +0200)

Trivial merge