asf - Revision 1917317: /avalon/branches/Leo_Simons