From: Andre Noll <maan@systemlinux.org>
Date: Mon, 20 Jul 2009 09:31:32 +0000 (+0200)
Subject: Merge commit 'meins/next' into next
X-Git-Tag: v0.4.0~50
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=7cd6e84f08240d3604ddb36ecd3c7b1ec6990446;p=paraslash.git

Merge commit 'meins/next' into next
---

7cd6e84f08240d3604ddb36ecd3c7b1ec6990446