asf - Revision 1923201: /avalon/branches/INITIAL_REFACTORING