From: Andre Noll <maan@systemlinux.org>
Date: Fri, 7 Nov 2008 09:31:50 +0000 (+0100)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.0.5~3
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;h=26ace9b8c1dc872e5da1b1122b45f01419761aab;p=adu.git

Merge commit 'meins/master'
---

26ace9b8c1dc872e5da1b1122b45f01419761aab