Changes

Summary

1. Merge the 2.3 branch to trunk.

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