Merged in revisions 2440 to 2441 of the main 1.2 line.
The command used was: $ svn merge -r2440:2441 svn+ssh://bugman@.../svn/relax/1.2
Authored by: bugman 2006-04-05
Parent: [r2441]
Child: [r2443]