From: Andre Noll <maan@systemlinux.org>
Date: Thu, 5 Nov 2009 23:28:05 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.1~120
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=f24f82d9a9134562abc331558b9e21feff91b93b;p=paraslash.git

Merge branch 'master' into next
---

f24f82d9a9134562abc331558b9e21feff91b93b