Porting r4448 to trunk. That change happened first on 0.10-stable and I forgot to port it to trunk at that time.
Authored by: cboos 2007-09-04
Parent: [r5985]
Child: [r5987]