dell commit
Merge branch 'master' of github.com:neoareslinux/python

Conflicts:
	threadingtest/killthreading.py