asf - Revision 1917754: /avalon/tags/MERLIN_3_0_0_FINAL