0.12dev: Merged [8240:8241] from 0.11-stable.
Authored by: rblank 2009-06-01
Parent: [r8254]
Child: [r8256]