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

diff --cc dss.c
Simple merge