Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Fri, 28 Nov 2008 21:29:43 +0000 (22:29 +0100)
committerAndre Noll <maan@systemlinux.org>
Fri, 28 Nov 2008 21:29:43 +0000 (22:29 +0100)

Trivial merge