Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Fri, 11 Jul 2008 15:08:51 +0000 (17:08 +0200)
committerAndre Noll <maan@systemlinux.org>
Fri, 11 Jul 2008 15:08:51 +0000 (17:08 +0200)

Trivial merge