Merge ../paraslash.meins/paraslash
authorAndre Noll <maan@systemlinux.org>
Fri, 22 Dec 2006 11:49:49 +0000 (12:49 +0100)
committerAndre Noll <maan@systemlinux.org>
Fri, 22 Dec 2006 11:49:49 +0000 (12:49 +0100)

Trivial merge