From: Andre Noll <maan@systemlinux.org>
Date: Mon, 20 Jul 2009 16:54:49 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.0~47
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=f74525557a0f63090de04fcb2ad401db0783f9a3;p=paraslash.git

Merge branch 'master' into next
---

f74525557a0f63090de04fcb2ad401db0783f9a3