Ported r2888 from the 1.3 line.
The command used was: svn merge -r2887:2888 svn+ssh://bugman@.../svn/relax/1.3
This fixes bug #7863 (https://gna.org/bugs/index.php?7863).
Authored by: bugman 2006-11-28
Parent: [r2888]
Child: [r2890]
