relax SVN archive

The command used was:
svn merge -r21094:r21093 .

.....
r21094 | bugman | 2013-10-14 15:40:53 +0200 (Mon, 14 Oct 2013) | 5 lines
Changed paths:
M /branches/relax_disp/test_suite/system_tests/relax_disp.py

Temporarily turned off the Relax_disp.test_sprangers_cpmg_data_auto_analysis system test.

This commit must be reverted!
.....