Merge branch 'master' into rm_hook
authorAndre Noll <maan@systemlinux.org>
Tue, 7 Apr 2009 14:17:01 +0000 (16:17 +0200)
committerAndre Noll <maan@systemlinux.org>
Tue, 7 Apr 2009 14:17:01 +0000 (16:17 +0200)
1  2 
dss.c

diff --cc dss.c
Simple merge