Ported r2856 and r2857 from the 1.3 line to fix bug #7787 (https://gna.org/bugs/?7787).
The command used was: svn merge -r2855:2857 svn+ssh://bugman@.../svn/relax/1.3
This bug was reported by Stephen Headey (https://gna.org/users/sjheadey).
Authored by: bugman 2006-11-20
Parent: [r2857]
Child: [r2859]
