0.12dev: Merged [7648] from 0.11-stable.
Authored by: jonas 2008-11-02
Parent: [r7648]
Child: [r7650]