main - Revision 11597: /attic/aub-stuff/trunk