0.12dev: Prevent [8285] from being merged from 0.11-stable.
Authored by: rblank 2009-06-23
Parent: [r8288]
Child: [r8290]
