asf - Revision 1917171: /avalon/branches/ActivationRestructure