Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 14 Sep 2009 08:08:57 +0000 (10:08 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 14 Sep 2009 08:08:57 +0000 (10:08 +0200)

Trivial merge