From: Andre Noll <maan@systemlinux.org>
Date: Fri, 21 Aug 2009 19:30:36 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.0~37
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=43e0a7f669d782e73513119b7140dc4e56bcc3d7

Merge branch 'master' into next
---

43e0a7f669d782e73513119b7140dc4e56bcc3d7