2013-03-19 10:18:35
Merge branch 'master' of http://github.com/zhang-yan-talendbj/deppDemo

Conflicts:
	com.caribe.stone.core/src/main/java/com/caribe/stone/jsoup/WordDemo.java