asf - Revision 1917820: /avalon/tags/MERLIN_3_0_RC4