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

Merge branch 'master' into next
---

702d72b58b6378c4cdb37cbb709fd1d351571123