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

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

1e89a35b86480c4bbcb143e88417707e15217f1a