Merge commit 'remotes/fml/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 3 Dec 2007 18:39:06 +0000 (19:39 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 3 Dec 2007 18:39:06 +0000 (19:39 +0100)

Trivial merge