trinity - Revision 5: /trunk