0.12dev: Merged [8061] from 0.11-stable.
Authored by: rblank 2009-04-05
Parent: [r8061]
Child: [r8063]