From: Andre Noll <maan@systemlinux.org>
Date: Thu, 9 Jul 2009 14:14:28 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.0~53
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=6f5030f4b257aba7ea4265ef3ae35d96477bbfc3;p=paraslash.git

Merge branch 'master' into next
---

6f5030f4b257aba7ea4265ef3ae35d96477bbfc3