The commands used were:
svn merge -r15030:15031 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15031:15032 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15032:15033 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15033:15034 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15034:15035 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15035:15036 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15036:15037 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15037:15038 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15038:15039 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15039:15040 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
No conflicts needed to be resolved.
