relax SVN archive

This follows a remark by Edward d'Auvergne at:
https://mail.gna.org/public/relax-devel/2012-09/msg00029.html
(Message-id: <CAED9pY9jMXUyUsRv_FDcoen-_3SOu3oyrYK_egyw89dgH5-ESQ@...>)

The command used was:
svn merge -r17456:17455 .

Then, the file was manually adjusted since there were apparently conflicts with svn...