0.12dev: prevent [7316-7317] from being merged.
Authored by: cboos 2008-07-04
Parent: [r7317]
Child: [r7319]
