0.12dev: block r8195 and r8210 from being merged (already merged separately from rework-testing branch)
Authored by: cboos 2009-05-22
Parent: [r8220]
Child: [r8222]
