Merge commit 'remotes/fml/master'
authorAndre Noll <maan@systemlinux.org>
Sun, 9 Dec 2007 21:01:52 +0000 (22:01 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 9 Dec 2007 21:01:52 +0000 (22:01 +0100)

Trivial merge