0.12dev: Merged [8165] from 0.11-stable.
Authored by: rblank 2009-05-01
Parent: [r8165]
Child: [r8167]