Merge commit 'remotes/fml/master'
authorAndre Noll <maan@systemlinux.org>
Tue, 11 Dec 2007 16:40:50 +0000 (17:40 +0100)
committerAndre Noll <maan@systemlinux.org>
Tue, 11 Dec 2007 16:40:50 +0000 (17:40 +0100)

Trivial merge