0.12dev: Prevent [8556] from being merged from 0.11-stable.
Authored by: rblank 2009-09-01
Parent: [r8556]
Child: [r8558]
