#8751: start the branch with the last patch from Jan Schukat.
Authored by: cboos 2009-10-18
Parent: [r8670]
Child: [r8672]