0.12dev: Merged [7758:7759] from 0.11-stable.
Authored by: rblank 2008-12-12
Parent: [r7760]
Child: [r7762]