From: Andre Noll <maan@systemlinux.org>
Date: Mon, 8 Dec 2008 16:21:51 +0000 (+0100)
Subject: Merge commit 'sio/master'
X-Git-Tag: v0.1.2~5
X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=commitdiff_plain;h=693e5a961e1d1a67ae2c2501913bf77881ebbb19;hp=-c

Merge commit 'sio/master'
---

693e5a961e1d1a67ae2c2501913bf77881ebbb19