asf - Revision 1917570: /avalon/tags/MERLIN_3_0_0_FINAL