From: Andre Noll <maan@systemlinux.org>
Date: Thu, 22 Oct 2009 20:51:20 +0000 (+0200)
Subject: Merge branch 'maint' into next
X-Git-Tag: v0.4.1~123
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=395aeb9da9c9cc2febe91b5a906c72e59e217594;p=paraslash.git

Merge branch 'maint' into next
---

395aeb9da9c9cc2febe91b5a906c72e59e217594