0.12dev: Merged [8260] from 0.11-stable.
Authored by: rblank 2009-06-02
Parent: [r8260]
Child: [r8262]