0.12dev: Blocked [8357] from being merged from 0.11-stable.
Authored by: rblank 2009-07-14
Parent: [r8359]
Child: [r8361]
