The commands used were:
svn merge -r15040:15041 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15041:15042 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15042:15043 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15043:15044 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15044:15045 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15045:15046 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15046:15047 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15047:15048 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15048:15049 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r15049:15050 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
A few missing user functions in prompt/ had to be resolved.
