From: Andre Noll <maan@systemlinux.org>
Date: Thu, 12 Nov 2009 21:12:46 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.1~116
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=7c850e951a653421164af1c80d8c7105cf58ab0c;p=paraslash.git

Merge branch 'master' into next
---

7c850e951a653421164af1c80d8c7105cf58ab0c