gateway - Revision 5285: /trunk