From: Andre Noll <maan@systemlinux.org>
Date: Tue, 7 Apr 2009 12:18:14 +0000 (+0200)
Subject: Merge branch 'master' into rm_hook
X-Git-Tag: v0.1.3~18
X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=commitdiff_plain;h=cd4dc100fa8507f254e935e0747161d6a201b73c

Merge branch 'master' into rm_hook
---

cd4dc100fa8507f254e935e0747161d6a201b73c