0.12dev: prevent merge of [7660,7665,7667]
Authored by: cboos 2008-11-12
Parent: [r7671]
Child: [r7673]
