From: Andre Noll <maan@systemlinux.org>
Date: Sat, 4 Jul 2009 21:23:00 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v0.4.0~68
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=03d45daad787b8f2ced3070e80c4550bf4b02931;p=paraslash.git

Merge branch 'master' into next
---

03d45daad787b8f2ced3070e80c4550bf4b02931