From: Andre Noll <maan@systemlinux.org>
Date: Sun, 9 Dec 2007 21:02:06 +0000 (+0100)
Subject: Merge commit 'remotes/yangtse/master'
X-Git-Tag: v0.3.0~61
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=55b45ec9ba3ef54395b3d22b3d00404f35e636a3;p=paraslash.git

Merge commit 'remotes/yangtse/master'
---

55b45ec9ba3ef54395b3d22b3d00404f35e636a3