0.12dev: Merged [8124] from 0.11-stable.
Authored by: rblank 2009-04-15
Parent: [r8124]
Child: [r8126]