0.12dev: Merged [8351-8352] from 0.11-stable.
Authored by: rblank 2009-07-07
Parent: [r8352]
Child: [r8354]