Added num_hw_threads on master branch
Merge branch 'master' of github.com:pjh/vm-analyze into syscluster

Conflicts:
	conf/system_conf.py