0.12dev: Merged [7577] from 0.11-stable.
Authored by: rblank 2008-09-30
Parent: [r7577]
Child: [r7579]