From: Andre Noll <maan@systemlinux.org>
Date: Thu, 3 Sep 2009 16:49:31 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.0~30^2~1
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=dd462c7e1b61864d6da01a877ced78dab72e2244;p=paraslash.git

Merge branch 'master' into next
---

dd462c7e1b61864d6da01a877ced78dab72e2244