asf - Revision 1918020: /avalon/tags/MERLIN_3_0_0_FINAL