MultiRepos: merged from 0.12dev [7959:7984/trunk]
Authored by: cboos 2009-03-22
Parent: [r7984]
Child: [r7986]