rework-testing: get the svn tests to work, using r8222 from trunk.
Authored by: cboos 2009-05-24
Parent: [r8236]
Child: [r8238]