Blocked r7786 to be ported to trunk as it's already a backport from trunk
Authored by: cboos 2009-01-13
Parent: [r7790]
Child: [r7792]
