trunk: Merged fix for #3645 ([7567]) from 0.11-stable.
Authored by: jonas 2008-09-28
Parent: [r7567]
Child: [r7569]