0.12dev: Merged [7802] from 0.11-stable.
Authored by: rblank 2009-01-27
Parent: [r7802]
Child: [r7804]