Merge commit 'stark/master'
authorAndre Noll <maan@systemlinux.org>
Tue, 20 May 2008 09:24:54 +0000 (11:24 +0200)
committerAndre Noll <maan@systemlinux.org>
Tue, 20 May 2008 09:24:54 +0000 (11:24 +0200)

Trivial merge