Ported r2736 from the 1.2 line to fix bug #7587 (https://gna.org/bugs/index.php?7587).
The command used was: svn merge -r2735:2736 svn+ssh://bugman@.../svn/relax/1.2
Authored by: bugman 2006-11-04
Parent: [r2736]
Child: [r2738]
