asd
asd
asd
asd
asd
asd
Merge remote-tracking branch 'sohu/master'

Conflicts:
	py-sessionlog/.project
	py-sessionlog/.pydevproject
	py-sessionlog/foo/ttypes.py
	py-sessionlog/sessionlog/ttypes.py
	py-sessionlog/test.py
	py-sessionlog/test2.py
	py-sessionlog/test3.py
	thrfit-test/.classpath
	thrfit-test/.project
	thrfit-test/.settings/org.eclipse.jdt.core.prefs
	thrfit-test/src/service/demo/Client.java
	thrfit-test/src/service/demo/HelloImpl.java
	thrfit-test/src/service/demo/Server.java