Ported r2605 from the 1.2 line.
The command used was: $ svn merge -r2604:2605 svn+ssh://bugman@.../svn/relax/1.2
This fixes bug #7277 (https://gna.org/bugs/?7277).
Authored by: bugman 2006-10-07
Parent: [r2605]
Child: [r2607]