Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 3 Aug 2009 14:00:31 +0000 (16:00 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 3 Aug 2009 14:00:31 +0000 (16:00 +0200)

Trivial merge