Prevent r7286 and r7287 from being ported to trunk via svnmerge
Authored by: cboos 2008-07-02
Parent: [r7295]
Child: [r7297]
