svn - Revision 3338: /branches/mock-integration