Merge commit 'meins/next' into next
authorAndre Noll <maan@systemlinux.org>
Mon, 20 Jul 2009 09:31:32 +0000 (11:31 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 20 Jul 2009 09:31:32 +0000 (11:31 +0200)

Trivial merge