Blocked r4023,r4032 from being merged in 0.10-stable.
Authored by: cboos 2006-10-24
Parent: [r4038]
Child: [r4040]