Manual merge of a file not updated in the svnmerge of the previous commit (r17694).
The command used was:
svn merge -r17254:r17687 svn+ssh://bugman@.../svn/relax/trunk/test_suite/system_tests/scripts/relax_fit.py test_suite/system_tests/scripts/relax_fit_exp_2param_neg.py