0.12dev: Merged [8126] from 0.11-stable.
Authored by: rblank 2009-04-17
Parent: [r8126]
Child: [r8128]