Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 30 Mar 2009 10:50:35 +0000 (12:50 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 30 Mar 2009 10:50:35 +0000 (12:50 +0200)

Trivial merge