0.12dev: Merged [7718:7721] from 0.11-stable.
Authored by: rblank 2008-11-28
Parent: [r7721]
Child: [r7723]