Merge commit 'remotes/fml/master'
authorAndre Noll <maan@systemlinux.org>
Fri, 7 Dec 2007 16:34:38 +0000 (17:34 +0100)
committerAndre Noll <maan@systemlinux.org>
Fri, 7 Dec 2007 16:34:38 +0000 (17:34 +0100)

Trivial merge