From: Andre Noll <maan@systemlinux.org>
Date: Fri, 13 Mar 2009 17:06:04 +0000 (+0100)
Subject: Merge commit 'meins/master'
X-Git-Tag: v0.1.3~22
X-Git-Url: http://git.tuebingen.mpg.de/?a=commitdiff_plain;ds=sidebyside;h=c2b0b6f4517f5f5a7ea6a3abd6d235068675e32e;hp=-c;p=dss.git

Merge commit 'meins/master'
---

c2b0b6f4517f5f5a7ea6a3abd6d235068675e32e