Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 21 Sep 2009 07:37:06 +0000 (09:37 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 21 Sep 2009 07:37:06 +0000 (09:37 +0200)

Trivial merge