From: Andre Noll <maan@systemlinux.org>
Date: Tue, 11 Dec 2007 20:17:01 +0000 (+0100)
Subject: Merge commit 'remotes/fml/master'
X-Git-Tag: v0.3.0~59
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=dbc0f1fba57b6de0f6bb4d7ac40167a1047ea3cd;p=paraslash.git

Merge commit 'remotes/fml/master'
---

dbc0f1fba57b6de0f6bb4d7ac40167a1047ea3cd