asf - Revision 1917339: /avalon/branches/INITIAL_REFACTORING