From: Andre Noll <maan@systemlinux.org>
Date: Sat, 1 Aug 2009 20:06:49 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.0~40
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=271c83d4fd9411be628fa650ce595ac79754d22e

Merge branch 'master' into next
---

271c83d4fd9411be628fa650ce595ac79754d22e