Merge branch 't/recycling'
authorAndre Noll <maan@systemlinux.org>
Mon, 7 Feb 2011 16:57:40 +0000 (17:57 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 7 Feb 2011 16:57:40 +0000 (17:57 +0100)
1  2 
dss.c

diff --cc dss.c
Simple merge