0.12dev: Prevent [8324-8325,8342] from being merged from 0.11-stable.
Authored by: rblank 2009-07-06
Parent: [r8345]
Child: [r8347]
