Merge commit 'remotes/fml/master'
authorAndre Noll <maan@systemlinux.org>
Sat, 24 Nov 2007 11:00:25 +0000 (12:00 +0100)
committerAndre Noll <maan@systemlinux.org>
Sat, 24 Nov 2007 11:00:25 +0000 (12:00 +0100)

Trivial merge