From: Andre Noll <maan@systemlinux.org>
Date: Sun, 18 Jan 2009 23:29:44 +0000 (+0100)
Subject: Merge commit 'athcx/master'
X-Git-Tag: v0.3.4~75
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=002731cd3938f3be6b71651e56c062af1adcdec0;p=paraslash.git

Merge commit 'athcx/master'
---

002731cd3938f3be6b71651e56c062af1adcdec0