From: Andre Noll <maan@systemlinux.org>
Date: Wed, 18 Nov 2009 18:28:28 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.1~114
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=0e5cf478af1c9d0507085a73785f0988e81c791f;p=paraslash.git

Merge branch 'master' into next
---

0e5cf478af1c9d0507085a73785f0988e81c791f