relax SVN archive

The command used was:
svn merge -r12388:12387 .

The branch is failing on the N_state_model.test_stereochem_analysis system test for some bizarre
reason!

.....
r12388 | bugman | 2011-01-20 20:51:15 +0100 (Thu, 20 Jan 2011) | 3 lines
Changed paths:
M /1.3

Initialized merge tracking via "svnmerge" with revisions "1-9870" from
svn+ssh://bugman@.../svn/relax/branches/bieri_gui
.....