Ported r2600 from the 1.2 line.
The command used was: svn merge -r2599:2600 svn+ssh://bugman@.../svn/relax/1.2
This fixes bug #7297 (https://gna.org/bugs/index.php?7297).
Authored by: bugman 2006-10-07
Parent: [r2602]
Child: [r2604]
