Merge of revision 2656 from 1.3 line.
svn merge -r 2655:2657 svn+ssh://macraild@.../svn/relax/1.3
This revision was accidentally applied to the 1.3 line.
Authored by: macraild 2006-10-23
Parent: [r2661]
Child: [r2663]