Ported r2612 from the 1.2 line.
The command used was: $ svn merge -r2611:2612 svn+ssh://bugman@.../svn/relax/1.2
This completes the fixing of bug #7241 (https://gna.org/bugs/?7241).
Authored by: bugman 2006-10-12
Parent: [r2613]
Child: [r2615]
