asf - Revision 1917140: /aries/trunk/cdi/cdi-extra