From: Andre Noll <maan@systemlinux.org>
Date: Fri, 4 Sep 2009 08:38:34 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.0~31
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=383d1bfb5084ea5a475e408d3cc9d2e2a3de5b88;p=paraslash.git

Merge branch 'master' into next
---

383d1bfb5084ea5a475e408d3cc9d2e2a3de5b88