From: Andre Noll <maan@systemlinux.org>
Date: Sun, 30 Nov 2008 20:15:29 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.3.4~98
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=89a0e510df07bc7210ca9e73381763fdd183df75;p=paraslash.git

Merge branch 'master' into next
---

89a0e510df07bc7210ca9e73381763fdd183df75