From: Andre Noll <maan@systemlinux.org>
Date: Sun, 19 Jul 2009 12:16:56 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.0~50^2~6
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=ad6c68022eea0b0962855a2120cf242446bf10b9;p=paraslash.git

Merge branch 'master' into next
---

ad6c68022eea0b0962855a2120cf242446bf10b9