Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash
authorAndre Noll <maan@systemlinux.org>
Wed, 4 Jul 2007 12:20:14 +0000 (14:20 +0200)
committerAndre Noll <maan@systemlinux.org>
Wed, 4 Jul 2007 12:20:14 +0000 (14:20 +0200)

Trivial merge