0.12dev: Merged [7804] from 0.11-stable.
Authored by: rblank 2009-01-28
Parent: [r7804]
Child: [r7806]