Ported r25627 from the 3.3.0 tag.
The command used was: svn merge -r25626:25627 svn+ssh://bugman@.../svn/relax/tags/3.3.0 .
..... Python 3 fixes via the 2to3 compatibility script. The command used was: 2to3 -w -f buffer -f idioms -f set_literal -f ws_comma -x except -x import -x imports -x long -x numliterals -x xrange . .....
Authored by: bugman 2014-09-04
Parent: [r25627]
Child: [r25629]