From: Andre Noll <maan@systemlinux.org>
Date: Tue, 25 Aug 2009 17:17:43 +0000 (+0200)
Subject: Merge remote branch 'fml/next' into next
X-Git-Tag: v0.4.0~34
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=57b7c4c20305a1b64e7a2141a90cfdc96956d1fc;p=paraslash.git

Merge remote branch 'fml/next' into next
---

57b7c4c20305a1b64e7a2141a90cfdc96956d1fc