From: Andre Noll <maan@systemlinux.org>
Date: Sat, 2 May 2009 09:50:17 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.3.5~61^2~2
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=345e7b4adce741621a412c3845712e8540b572ad;p=paraslash.git

Merge branch 'master' into next
---

345e7b4adce741621a412c3845712e8540b572ad