add wabacus4.2
Merge branch 'master' of ssh://springworks.info/~/git/opensource

Conflicts:
	.gitmodules