small cleanups
Merge branch 'master' of devel:sources/antisipate

Conflicts:
	system/Makefile