Ported r2798 and r2799 from the 1.3 line (fix for bug #7676).
The command used was: svn merge -r2797:2799 svn+ssh://bugman@.../svn/relax/1.3
These changes fix bug #7676 (https://gna.org/bugs/?7676) reported by Stephen Headey <s dot j dot headey at massey dot ac dot nz>.
Authored by: bugman 2006-11-10
Parent: [r2799]
Child: [r2801]
