0.12dev: merged r8209 and r8212 (make tests compatible with svn 1.6.x)
Authored by: cboos 2009-05-22
Parent: [r8221]
Child: [r8223]