From: Andre Noll <maan@systemlinux.org>
Date: Thu, 9 Jul 2009 14:14:19 +0000 (+0200)
Subject: Merge commit 'meins/next' into next
X-Git-Tag: v0.4.0~54
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=a37e903213215dd36b11bbde4ea98e1d4590a472;p=paraslash.git

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

a37e903213215dd36b11bbde4ea98e1d4590a472