Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 22 Mar 2010 08:32:32 +0000 (09:32 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 22 Mar 2010 08:32:32 +0000 (09:32 +0100)

Trivial merge