0.12dev: Merged [8173-8174] from 0.11-stable.
Authored by: rblank 2009-05-05
Parent: [r8174]
Child: [r8176]