Follow-up to r3938, mark r3931 as merged.
Authored by: cboos 2006-10-17
Parent: [r3950]
Child: [r3952]
