Blocked revisions [7065,7069,7071] via svnmerge, as they have been ported manually.
Authored by: cboos 2008-05-26
Parent: [r7144]
Child: [r7146]
