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

Merge branch 'master' into next
---

1aeb12d89d5334c70be373fa1ef7a547a8fd6ba4