0.10-stable branch: Ported fix r4243 to 0.10-stable, fixes #4122.
Authored by: jonas 2006-11-12
Parent: [r4243]
Child: [r4245]