Prevent backported r7616 from being merged again.
Authored by: cboos 2008-10-29
Parent: [r7620]
Child: [r7622]
