0.12dev: Merged [7780] from 0.11-stable.
Authored by: rblank 2009-01-09
Parent: [r7780]
Child: [r7782]