Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Tue, 25 May 2010 07:23:44 +0000 (09:23 +0200)
committerAndre Noll <maan@systemlinux.org>
Tue, 25 May 2010 07:23:44 +0000 (09:23 +0200)

Trivial merge