Ported r2856 to r2897 from the 1.3 line.
The command used was: svn merge -r2855:2897 svn+ssh://bugman@.../svn/relax/1.3
Authored by: bugman 2006-12-02
Parent: [r2907]
Child: [r2909]