0.12dev: Merged [7810] from 0.11-stable.
Authored by: rblank 2009-01-30
Parent: [r7810]
Child: [r7812]