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

Merge branch 'master' into next
---

29adb40f69ca452a719e8519a8fa9452b3143e1d