Merge commit 'meins/next' into next
authorAndre Noll <maan@systemlinux.org>
Fri, 4 Sep 2009 08:39:09 +0000 (10:39 +0200)
committerAndre Noll <maan@systemlinux.org>
Fri, 4 Sep 2009 08:39:09 +0000 (10:39 +0200)

Trivial merge