MultiRepos: merged r8175 and r8176 from 0.12dev
Authored by: cboos 2009-05-06
Parent: [r8177]
Child: [r8179]