From: Andre Noll <maan@systemlinux.org>
Date: Mon, 7 Feb 2011 16:57:40 +0000 (+0100)
Subject: Merge branch 't/recycling'
X-Git-Tag: v0.1.5~19
X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=commitdiff_plain;h=44c1bec753339f5cddcc34c4419505ec928cf88a

Merge branch 't/recycling'
---

44c1bec753339f5cddcc34c4419505ec928cf88a