0.12dev: Merged [7635] from 0.11-stable.
Authored by: rblank 2008-10-30
Parent: [r7635]
Child: [r7637]