Changes

Summary

1. Merge the 2.3 branch to trunk.

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