Changes

Summary

1. Merge the 2.3 branch to trunk.

Revision 19742 by tao: Merge the 2.3 branch to trunk.
Change Type	Path in Repository	Path in Workspace
	/software/cicore/trunk/cn/d1_cn_tools/d1_cn_version_tool	d1_cn_version_tool