Merged the change of revision 2397.
The command used was: $ svn merge -r2395:2397 svn+ssh://bugman@.../svn/relax/1.2
Authored by: bugman 2006-04-05
Parent: [r2438]
Child: [r2440]