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

Merge branch 'master' into next
---

7205bdd68b0ad3c50bbe7b5e01eb62be97aab5c8