0.12dev: Merged [7909-7910] from 0.11-stable.
Authored by: rblank 2009-02-19
Parent: [r7911]
Child: [r7913]