asf - Revision 1916631: /avalon/branches/Leo_Simons