Merge commit 'meins/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 29 Sep 2008 09:14:42 +0000 (11:14 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 29 Sep 2008 09:14:42 +0000 (11:14 +0200)

Trivial merge