From: Andre Noll <maan@systemlinux.org>
Date: Mon, 2 Feb 2009 18:23:33 +0000 (+0100)
Subject: Merge commit 'stark/master'
X-Git-Tag: v0.1.2~2
X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=commitdiff_plain;h=064b878216517a8482e285003e92066b25cb6143

Merge commit 'stark/master'
---

064b878216517a8482e285003e92066b25cb6143