From: Andre Noll <maan@systemlinux.org>
Date: Sun, 6 Sep 2009 20:23:58 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.0~27
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=3ddbf5db98280cb09ef74726573b0b3f3b7e62d6

Merge branch 'master' into next
---

3ddbf5db98280cb09ef74726573b0b3f3b7e62d6