From: Andre Noll <maan@systemlinux.org>
Date: Mon, 30 Mar 2009 10:50:35 +0000 (+0200)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.1.3~18^2
X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=commitdiff_plain;h=2c323390175ba8d8d8b9f8dcd5201abb6039aad6

Merge commit 'meins/master'
---

2c323390175ba8d8d8b9f8dcd5201abb6039aad6