process
Merge branch 'master' of https://github.com/inkscope/inkscope

Conflicts:
	inkscopeCollect/sysprobe.py