Merge commit 'meins/next' into next
authorAndre Noll <maan@systemlinux.org>
Fri, 10 Jul 2009 12:55:05 +0000 (14:55 +0200)
committerAndre Noll <maan@systemlinux.org>
Fri, 10 Jul 2009 12:55:05 +0000 (14:55 +0200)

Trivial merge