From: Andre Noll <maan@systemlinux.org>
Date: Mon, 10 Nov 2008 09:23:15 +0000 (+0100)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.0.5~1
X-Git-Url: http://git.tuebingen.mpg.de/adu.git/log?a=commitdiff_plain;h=3bb9b0ca535be1eb28b64972bdf0e205e6afc93e;p=adu.git

Merge commit 'meins/master'
---

3bb9b0ca535be1eb28b64972bdf0e205e6afc93e