Merge /fml/ag-raetsch/home/maan/scm/paraslash_meins/paraslash
authorAndre Noll <maan@systemlinux.org>
Mon, 11 Jun 2007 10:06:54 +0000 (12:06 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 11 Jun 2007 10:06:54 +0000 (12:06 +0200)

Trivial merge