Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Sat, 19 Jul 2008 15:24:52 +0000 (17:24 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 19 Jul 2008 15:24:52 +0000 (17:24 +0200)

Trivial merge