asf - Revision 1917337: /avalon/branches/INITIAL_REFACTORING