fix
Merge branch 'master' of https://github.com/kitigai/python

Conflicts:
	cros2.py
	singou.pyc