From: Andre Noll <maan@systemlinux.org>
Date: Sun, 2 Aug 2009 13:31:16 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.0~39
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=b9c2428555a2a6edb038234a33e5072dc8c5ba7a

Merge branch 'master' into next
---

b9c2428555a2a6edb038234a33e5072dc8c5ba7a