ported r2768 (fix to bug #7641)
commands used svn merge -r2767:2768 svn+ssh://varioustoxins@.../svn/relax/1.2
Authored by: varioustoxins 2006-11-07
Parent: [r2769]
Child: [r2771]
