Ported r2848 from the 1.3 line.
The command used was: svn merge -r2847:2848 svn+ssh://bugman@.../svn/relax/1.3
Authored by: bugman 2006-12-02
Parent: [r2903]
Child: [r2905]