Blocked r3857,r4189,r4296:4297,r4331,r4333:4336,r4339 from being merged, via svnmerge.
Authored by: cboos 2006-11-24
Parent: [r4344]
Child: [r4346]