0.12dev: Merged [7988] from 0.11-stable.
Authored by: rblank 2009-03-25
Parent: [r7988]
Child: [r7990]