0.12dev: Merged [8655] from 0.11-stable.
Authored by: rblank 2009-10-09
Parent: [r8655]
Child: [r8657]