Oops, r5986 was a mix of automated and manual merge, fixing it.
Authored by: cboos 2007-09-04
Parent: [r5986]
Child: [r5988]