merge r4715 to 0.10-stable (fixes #3879)
Authored by: mgood 2007-02-09
Parent: [r4715]
Child: [r4717]