Blocked revisions r4115,r4130 and r4165 from being merged to 0.10-stable.
Authored by: cboos 2006-11-07
Parent: [r4167]
Child: [r4169]
