Blame branch: merge with trunk@..., using svnmerge (r4520,4524,4532-4533,4535-4536,4539)
Authored by: cboos 2007-01-10
Parent: [r4540]
Child: [r4542]