0.12dev: Prevent [8309] from being merged.
Authored by: rblank 2009-06-26
Parent: [r8313]
Child: [r8315]
