0.12dev: Merged [7574] from 0.11-stable.
Authored by: rblank 2008-09-29
Parent: [r7574]
Child: [r7576]