Mourning for the dead in Sichuan earthquake!
Merge branch 'master' of git://github.com/hazirguo/socode into hazirguo-master

Conflicts:
	socode.py