merged [590] into 0.7-stable. Closes #441.
Authored by: jonas 2004-05-20
Parent: [r590]
Child: [r592]