Merge branch 'master' of ssh://git.berlios.de/gitroot/sst