0.12dev: Merged [8119-8120] from 0.11-stable.
Authored by: rblank 2009-04-13
Parent: [r8120]
Child: [r8122]