Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Fri, 7 Nov 2008 09:31:50 +0000 (10:31 +0100)
committerAndre Noll <maan@systemlinux.org>
Fri, 7 Nov 2008 09:31:50 +0000 (10:31 +0100)

Trivial merge