0.12dev: Merged [7800] from 0.11-stable.
Authored by: rblank 2009-01-26
Parent: [r7800]
Child: [r7802]