From: Andre Noll <maan@systemlinux.org>
Date: Thu, 12 Nov 2009 23:48:33 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.1~115
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=6d9694ba196bdfa0398a379e0f1b4deeef2bb4c5

Merge branch 'master' into next
---

6d9694ba196bdfa0398a379e0f1b4deeef2bb4c5