From: Andre Noll <maan@systemlinux.org>
Date: Mon, 9 Nov 2009 17:31:34 +0000 (+0100)
Subject: Merge commit 'meins/next' into next
X-Git-Tag: v0.4.1~117
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=805bd1d35c854dbfe07d567ef78fc37929011312;p=paraslash.git

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

805bd1d35c854dbfe07d567ef78fc37929011312