Merged r4459 to 0.10-stable (fixes #4311)
Authored by: mgood 2006-12-15
Parent: [r4459]
Child: [r4461]