Backported the relax 2.2.5 changes file additions to trunk.
The command used was: svn merge -r19097:19098 svn+ssh://bugman@.../svn/relax/tags/2.2.5 .
Authored by: bugman 2013-03-24
Parent: [r19098]
Child: [r19100]
