Merge commit 'fml/master'
authorAndre Noll <maan@systemlinux.org>
Tue, 23 Dec 2008 22:14:34 +0000 (23:14 +0100)
committerAndre Noll <maan@systemlinux.org>
Tue, 23 Dec 2008 22:14:34 +0000 (23:14 +0100)

Trivial merge