Merge commit 'stark/master'
authorAndre Noll <maan@systemlinux.org>
Mon, 2 Feb 2009 18:23:33 +0000 (19:23 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 2 Feb 2009 18:23:33 +0000 (19:23 +0100)
1  2 
dss.c

diff --cc dss.c
Simple merge