merge成功
xuxuan
Merge remote-tracking branch 'origin/xuetai1' into xuetai1

Conflicts:
	src/cn/com/config/spring/applicationContext-dao.xml