From: Andre Noll <maan@systemlinux.org>
Date: Sat, 24 Oct 2009 19:24:56 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.1~122
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=141dc61fdf8720b6e0126b10c18d429d9d4944db

Merge branch 'master' into next
---

141dc61fdf8720b6e0126b10c18d429d9d4944db