Blocked [7309,7423,7448,7452,7455] from being merge to trunk from 0.11-stable via svnmerge.
Authored by: cboos 2008-09-12
Parent: [r7533]
Child: [r7535]