rebase sdos-test on the svn mirror
rebase jitv branch too