From: Andre Noll <maan@systemlinux.org>
Date: Mon, 7 Jan 2008 15:32:02 +0000 (+0100)
Subject: Merge commit 'remotes/yangtse/master'
X-Git-Tag: v0.3.0~12
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=1ce6af6bcbef182148e6ae06d71f4caf053bd644;p=paraslash.git

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

1ce6af6bcbef182148e6ae06d71f4caf053bd644