0.12dev: Merged [8147] from 0.11-stable.
Authored by: rblank 2009-04-25
Parent: [r8147]
Child: [r8149]