From: Andre Noll <maan@systemlinux.org>
Date: Sun, 19 Apr 2009 21:17:38 +0000 (+0200)
Subject: Merge commit 'athcx/next' into next
X-Git-Tag: v0.3.5~61^2~8
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=a7f31bd369e5eda15361bef5aee2529bdb6eb89e;p=paraslash.git

Merge commit 'athcx/next' into next
---

a7f31bd369e5eda15361bef5aee2529bdb6eb89e